From 5042f74824784fc90707fee92b6f025b6e7714bf Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Wed, 24 Jul 2024 11:26:03 +0200 Subject: [PATCH] Loosen dependencies, since we use requirements.txt (+ allow pre-commit to run with Python 3.10) --- .pre-commit-config.yaml | 2 +- pyproject.toml | 18 +++--- requirements/base.txt | 97 +++++++++++++++++++++++++++++++ requirements/requirements-dev.txt | 18 +++--- 4 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 requirements/base.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 49e1ce6..7388e5d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ default_language_version: - python: python3.12 + python: python3 exclude: ^.*\b(migrations)\b.*$ repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/pyproject.toml b/pyproject.toml index 643b1cd..377ebef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,17 +12,17 @@ authors = [ { name = "Víðir Valberg Guðmundsson", email = "valberg@orn.li" }, ] dependencies = [ - "Django==5.0.7", - "django-money==3.5.2", - "django-allauth==0.63.6", - "psycopg[binary]==3.2.1", - "environs[django]==11.0.0", - "uvicorn==0.30.1", - "whitenoise==6.7.0", - "django-zen-queries==2.1.0", + "Django~=5.0", + "django-money~=3.5", + "django-allauth~=0.63", + "psycopg[binary]~=3.2", + "environs[django]>=11,<12", + "uvicorn~=0.30", + "whitenoise~=6.7", + "django-zen-queries~=2.1", "django-registries==0.0.3", "django-view-decorator==0.0.4", - "django-oauth-toolkit==2.4.0", + "django-oauth-toolkit~=2.4", ] version = "0.0.1" diff --git a/requirements/base.txt b/requirements/base.txt new file mode 100644 index 0000000..08f9da9 --- /dev/null +++ b/requirements/base.txt @@ -0,0 +1,97 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --output-file=requirements/base.txt pyproject.toml +# +asgiref==3.8.1 + # via django +babel==2.15.0 + # via py-moneyed +certifi==2024.7.4 + # via requests +cffi==1.16.0 + # via cryptography +charset-normalizer==3.3.2 + # via requests +click==8.1.7 + # via uvicorn +cryptography==43.0.0 + # via jwcrypto +dj-database-url==2.2.0 + # via environs +dj-email-url==1.0.6 + # via environs +django==5.0.7 + # via + # dj-database-url + # django-allauth + # django-money + # django-oauth-toolkit + # django-registries + # django-view-decorator + # django-zen-queries + # membersystem (pyproject.toml) +django-allauth==0.63.6 + # via membersystem (pyproject.toml) +django-cache-url==3.4.5 + # via environs +django-money==3.5.2 + # via membersystem (pyproject.toml) +django-oauth-toolkit==2.4.0 + # via membersystem (pyproject.toml) +django-registries==0.0.3 + # via membersystem (pyproject.toml) +django-view-decorator==0.0.4 + # via membersystem (pyproject.toml) +django-zen-queries==2.1.0 + # via membersystem (pyproject.toml) +environs[django]==11.0.0 + # via + # environs + # membersystem (pyproject.toml) +h11==0.14.0 + # via uvicorn +idna==3.7 + # via requests +jwcrypto==1.5.6 + # via django-oauth-toolkit +marshmallow==3.21.3 + # via environs +oauthlib==3.2.2 + # via django-oauth-toolkit +packaging==24.1 + # via marshmallow +psycopg[binary]==3.2.1 + # via + # membersystem (pyproject.toml) + # psycopg +psycopg-binary==3.2.1 + # via psycopg +py-moneyed==3.0 + # via django-money +pycparser==2.22 + # via cffi +python-dotenv==1.0.1 + # via environs +pytz==2024.1 + # via django-oauth-toolkit +requests==2.32.3 + # via django-oauth-toolkit +sqlparse==0.5.1 + # via django +typing-extensions==4.12.2 + # via + # dj-database-url + # jwcrypto + # psycopg + # py-moneyed +urllib3==2.2.2 + # via requests +uvicorn==0.30.3 + # via membersystem (pyproject.toml) +whitenoise==6.7.0 + # via membersystem (pyproject.toml) + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index f044e8c..88d018a 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -11,17 +11,17 @@ # - django-debug-toolbar==4.2.0 # - django-browser-reload==1.7.0 # - model-bakery==1.17.0 -# - django-allauth==0.63.6 -# - django-money==3.5.2 -# - django-oauth-toolkit==2.4.0 +# - django-allauth~=0.63 +# - django-money~=3.5 +# - django-oauth-toolkit~=2.4 # - django-registries==0.0.3 # - django-view-decorator==0.0.4 -# - django-zen-queries==2.1.0 -# - django==5.0.7 -# - environs[django]==11.0.0 -# - psycopg[binary]==3.2.1 -# - uvicorn==0.30.1 -# - whitenoise==6.7.0 +# - django-zen-queries~=2.1 +# - django~=5.0 +# - environs[django]<12,>=11 +# - psycopg[binary]~=3.2 +# - uvicorn~=0.30 +# - whitenoise~=6.7 # asgiref==3.8.1