diff --git a/bin/compile_dependencies.bat b/bin/compile_dependencies.bat deleted file mode 100644 index c8065f2..0000000 --- a/bin/compile_dependencies.bat +++ /dev/null @@ -1,29 +0,0 @@ -@echo off - -for /F "tokens=1" %%i in ('git rev-parse --show-toplevel') do set toplevel=%%i - -cd %toplevel% - -REM Base deps -pip-compile^ - --no-emit-index-url^ - %*^ - requirements/base.in - -REM Dependencies for ci -pip-compile^ - --no-emit-index-url^ - --output-file requirements/ci.txt^ - %*^ - requirements/base.txt^ - requirements/test-tools.in^ - requirements/ci.in - -REM Dependencies for development -pip-compile^ - --no-emit-index-url^ - --output-file requirements/dev.txt^ - %*^ - requirements/base.txt^ - requirements/test-tools.in^ - requirements/dev.in diff --git a/bin/compile_dependencies.sh b/bin/compile_dependencies.sh index b338001..e29247c 100755 --- a/bin/compile_dependencies.sh +++ b/bin/compile_dependencies.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +#!/bin/sh # # Compile the dependencies for production, CI and development. # @@ -7,38 +6,37 @@ # # ./bin/compile_dependencies.sh # -# Any extra flags/arguments passed to this wrapper script are passed down to pip-compile. +# Any extra flags/arguments passed to this wrapper script are passed down to uv pip compile. # E.g. to update a package: # # ./bin/compile_dependencies.sh --upgrade-package django - - set -ex +command -v uv || (echo "uv not found on PATH. Install it https://astral.sh/uv" >&2 && exit 1) + +cwd="${PWD}" toplevel=$(git rev-parse --show-toplevel) -cd $toplevel +cd "${toplevel}" + +export UV_CUSTOM_COMPILE_COMMAND="./bin/compile_dependencies.sh" # Base (& prod) deps -pip-compile \ - --no-emit-index-url \ +uv pip compile \ + --output-file requirements/base.txt \ "$@" \ requirements/base.in -# Dependencies for CI -pip-compile \ - --no-emit-index-url \ +# Dependencies for testing +uv pip compile \ --output-file requirements/ci.txt \ "$@" \ - requirements/base.txt \ requirements/test-tools.in \ - requirements/ci.in -# Dependencies for development -pip-compile \ - --no-emit-index-url \ +# Dev depedencies - exact same set as CI + some extra tooling +uv pip compile \ --output-file requirements/dev.txt \ "$@" \ - requirements/base.txt \ - requirements/test-tools.in \ requirements/dev.in + +cd "${cwd}" diff --git a/requirements/base.txt b/requirements/base.txt index 90ac5d5..b13aa8c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,9 +1,5 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-emit-index-url requirements/base.in -# +# This file was autogenerated by uv via the following command: +# ./bin/compile_dependencies.sh amqp==5.1.1 # via kombu annotated-types==0.7.0 @@ -73,7 +69,7 @@ cryptography==42.0.7 # mozilla-django-oidc # pyopenssl # webauthn -django==4.2.15 +django==4.2.17 # via # commonground-api-common # django-admin-index @@ -170,7 +166,7 @@ django-solo==2.0.0 # notifications-api-common # sharing-configs # zgw-consumers -django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 +django-two-factor-auth==1.16.0 # via maykin-2fa djangorestframework==3.15.2 # via @@ -194,10 +190,8 @@ drf-nested-routers==0.94.1 # via # -r requirements/base.in # commonground-api-common -drf-spectacular[sidecar]==0.27.2 - # via - # drf-spectacular - # open-api-framework +drf-spectacular==0.27.2 + # via open-api-framework drf-spectacular-sidecar==2024.7.1 # via drf-spectacular drf-yasg==1.21.7 @@ -230,7 +224,7 @@ isodate==0.6.1 # via commonground-api-common itypes==1.2.0 # via coreapi -jinja2==3.1.4 +jinja2==3.1.5 # via coreschema josepy==1.13.0 # via mozilla-django-oidc @@ -246,13 +240,13 @@ maykin-2fa==1.0.1 # via open-api-framework mozilla-django-oidc==4.0.0 # via mozilla-django-oidc-db -mozilla-django-oidc-db[django-setup-configuration]==0.21.1 +mozilla-django-oidc-db==0.21.1 # via # -r requirements/base.in # open-api-framework notifications-api-common==0.3.1 # via commonground-api-common -open-api-framework==0.9.1 +open-api-framework==0.9.2 # via -r requirements/base.in orderedmultidict==1.0.1 # via furl @@ -276,10 +270,8 @@ pydantic==2.9.2 # pydantic-settings pydantic-core==2.23.4 # via pydantic -pydantic-settings[yaml]==2.6.1 - # via - # django-setup-configuration - # pydantic-settings +pydantic-settings==2.6.1 + # via django-setup-configuration pyjwt==2.7.0 # via # commonground-api-common @@ -329,6 +321,8 @@ requests-mock==1.12.1 # via commonground-api-common sentry-sdk==2.12.0 # via open-api-framework +setuptools==75.6.0 + # via josepy sharing-configs==0.1.2 # via -r requirements/base.in six==1.16.0 @@ -342,7 +336,7 @@ six==1.16.0 # qrcode sqlparse==0.5.0 # via django -tornado==6.4.1 +tornado==6.4.2 # via flower typing-extensions==4.11.0 # via @@ -382,6 +376,3 @@ zgw-consumers==0.35.1 # commonground-api-common # notifications-api-common # open-api-framework - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/ci.in b/requirements/ci.in deleted file mode 100644 index ec8ac8a..0000000 --- a/requirements/ci.in +++ /dev/null @@ -1,2 +0,0 @@ -codecov -coverage diff --git a/requirements/ci.txt b/requirements/ci.txt index 3ca4980..fd182c8 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,35 +1,37 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-emit-index-url --output-file=requirements/ci.txt requirements/base.txt requirements/ci.in requirements/test-tools.in -# +# This file was autogenerated by uv via the following command: +# ./bin/compile_dependencies.sh amqp==5.1.1 # via + # -c requirements/base.txt # -r requirements/base.txt # kombu annotated-types==0.7.0 # via + # -c requirements/base.txt # -r requirements/base.txt # pydantic ape-pie==0.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # notifications-api-common # zgw-consumers asgiref==3.6.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django # django-axes # django-cors-headers asn1crypto==1.5.1 # via + # -c requirements/base.txt # -r requirements/base.txt # webauthn attrs==23.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # glom # jsonschema @@ -37,45 +39,54 @@ beautifulsoup4==4.12.2 # via webtest billiard==4.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # celery black==24.8.0 # via -r requirements/test-tools.in bleach==6.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework boltons==23.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # face # glom cbor2==5.6.3 # via + # -c requirements/base.txt # -r requirements/base.txt # webauthn celery==5.4.0 # via + # -c requirements/base.txt # -r requirements/base.txt # flower # notifications-api-common # open-api-framework certifi==2024.7.4 # via + # -c requirements/base.txt # -r requirements/base.txt # elastic-apm # requests # sentry-sdk cffi==1.15.1 # via + # -c requirements/base.txt # -r requirements/base.txt # cryptography charset-normalizer==3.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # requests click==8.1.3 # via + # -c requirements/base.txt # -r requirements/base.txt # black # celery @@ -84,36 +95,43 @@ click==8.1.3 # click-repl click-didyoumean==0.3.0 # via + # -c requirements/base.txt # -r requirements/base.txt # celery click-plugins==1.1.1 # via + # -c requirements/base.txt # -r requirements/base.txt # celery click-repl==0.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # celery codecov==2.1.13 - # via -r requirements/ci.in + # via -r requirements/test-tools.in commonground-api-common==2.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework coreapi==2.3.3 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common coreschema==0.0.4 # via + # -c requirements/base.txt # -r requirements/base.txt # coreapi coverage==4.5.4 # via - # -r requirements/ci.in + # -r requirements/test-tools.in # codecov cryptography==42.0.7 # via + # -c requirements/base.txt # -r requirements/base.txt # django-simple-certmanager # josepy @@ -122,8 +140,9 @@ cryptography==42.0.7 # webauthn cssselect==1.2.0 # via pyquery -django==4.2.15 +django==4.2.17 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # django-admin-index @@ -164,94 +183,118 @@ django==4.2.15 # zgw-consumers django-admin-index==3.1.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-appconf==1.0.6 # via + # -c requirements/base.txt # -r requirements/base.txt # django-log-outgoing-requests django-axes==6.5.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-cors-headers==4.4.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-csp==3.8 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-filter==24.2 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # open-api-framework django-formtools==2.4.1 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth django-jsonform==2.22.0 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc-db # open-api-framework django-jsonsuit==0.5.0 - # via -r requirements/base.txt + # via + # -c requirements/base.txt + # -r requirements/base.txt django-log-outgoing-requests==0.6.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-markup==1.8.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-ordered-model==3.7.4 # via + # -c requirements/base.txt # -r requirements/base.txt # django-admin-index django-otp==1.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth django-phonenumber-field==5.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth django-privates==2.0.0.post0 # via + # -c requirements/base.txt # -r requirements/base.txt # django-simple-certmanager django-redis==5.4.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-relativedelta==2.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # zgw-consumers django-rest-framework-condition==0.1.1 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common django-sendfile2==0.7.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django-privates django-sessionprofile==3.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-setup-configuration==0.5.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework django-simple-certmanager==2.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # zgw-consumers django-solo==2.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # django-log-outgoing-requests @@ -259,15 +302,16 @@ django-solo==2.0.0 # notifications-api-common # sharing-configs # zgw-consumers -django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 +django-two-factor-auth==1.16.0 # via + # -c requirements/base.txt # -r requirements/base.txt - # django-two-factor-auth # maykin-2fa django-webtest==1.9.10 # via -r requirements/test-tools.in djangorestframework==3.15.2 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # djangorestframework-gis @@ -279,44 +323,53 @@ djangorestframework==3.15.2 # open-api-framework djangorestframework-camel-case==1.4.2 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # notifications-api-common djangorestframework-gis==1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework djangorestframework-inclusions==1.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework drf-nested-routers==0.94.1 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common -drf-spectacular[sidecar]==0.27.2 +drf-spectacular==0.27.2 # via + # -c requirements/base.txt # -r requirements/base.txt - # drf-spectacular # open-api-framework drf-spectacular-sidecar==2024.7.1 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-spectacular drf-yasg==1.21.7 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common ecs-logging==2.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # elastic-apm elastic-apm==6.22.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework face==20.1.1 # via + # -c requirements/base.txt # -r requirements/base.txt # glom factory-boy==3.2.1 @@ -327,82 +380,98 @@ flake8==7.1.1 # via -r requirements/test-tools.in flower==2.0.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework freezegun==1.2.2 # via -r requirements/test-tools.in furl==2.1.3 # via + # -c requirements/base.txt # -r requirements/base.txt # ape-pie glom==23.3.0 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc-db humanize==4.9.0 # via + # -c requirements/base.txt # -r requirements/base.txt # flower idna==3.7 # via + # -c requirements/base.txt # -r requirements/base.txt # requests # yarl inflection==0.5.1 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-spectacular # drf-yasg iso-639==0.4.5 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common isodate==0.6.1 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common isort==5.13.2 # via -r requirements/test-tools.in itypes==1.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # coreapi -jinja2==3.1.4 +jinja2==3.1.5 # via + # -c requirements/base.txt # -r requirements/base.txt # coreschema josepy==1.13.0 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc jsonschema==4.17.3 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-spectacular kombu==5.3.5 # via + # -c requirements/base.txt # -r requirements/base.txt # celery lxml==4.9.2 # via pyquery markupsafe==2.1.2 # via + # -c requirements/base.txt # -r requirements/base.txt # jinja2 maykin-2fa==1.0.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework mccabe==0.7.0 # via flake8 mozilla-django-oidc==4.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc-db -mozilla-django-oidc-db[django-setup-configuration]==0.21.1 +mozilla-django-oidc-db==0.21.1 # via + # -c requirements/base.txt # -r requirements/base.txt - # mozilla-django-oidc-db # open-api-framework multidict==6.0.5 # via yarl @@ -410,20 +479,26 @@ mypy-extensions==1.0.0 # via black notifications-api-common==0.3.1 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common -open-api-framework==0.9.1 - # via -r requirements/base.txt +open-api-framework==0.9.2 + # via + # -c requirements/base.txt + # -r requirements/base.txt orderedmultidict==1.0.1 # via + # -c requirements/base.txt # -r requirements/base.txt # furl oyaml==1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common packaging==23.1 # via + # -c requirements/base.txt # -r requirements/base.txt # black # drf-yasg @@ -431,51 +506,60 @@ pathspec==0.12.1 # via black phonenumberslite==8.13.30 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth platformdirs==4.3.6 # via black prometheus-client==0.20.0 # via + # -c requirements/base.txt # -r requirements/base.txt # flower prompt-toolkit==3.0.38 # via + # -c requirements/base.txt # -r requirements/base.txt # click-repl psycopg2==2.9.9 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework pycodestyle==2.12.1 # via flake8 pycparser==2.21 # via + # -c requirements/base.txt # -r requirements/base.txt # cffi pydantic==2.9.2 # via + # -c requirements/base.txt # -r requirements/base.txt # django-setup-configuration # pydantic-settings pydantic-core==2.23.4 # via + # -c requirements/base.txt # -r requirements/base.txt # pydantic -pydantic-settings[yaml]==2.6.1 +pydantic-settings==2.6.1 # via + # -c requirements/base.txt # -r requirements/base.txt # django-setup-configuration - # pydantic-settings pyflakes==3.2.0 # via flake8 pyjwt==2.7.0 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # zgw-consumers pyopenssl==24.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # josepy # webauthn @@ -483,10 +567,12 @@ pyquery==2.0.0 # via -r requirements/test-tools.in pyrsistent==0.19.3 # via + # -c requirements/base.txt # -r requirements/base.txt # jsonschema python-dateutil==2.8.2 # via + # -c requirements/base.txt # -r requirements/base.txt # celery # django-relativedelta @@ -494,20 +580,24 @@ python-dateutil==2.8.2 # freezegun python-decouple==3.8 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework python-dotenv==1.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework # pydantic-settings pytz==2023.3 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-yasg # flower pyyaml==6.0.2 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-spectacular # drf-yasg @@ -516,14 +606,17 @@ pyyaml==6.0.2 # vcrpy qrcode==6.1 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth redis==4.5.5 # via + # -c requirements/base.txt # -r requirements/base.txt # django-redis requests==2.32.3 # via + # -c requirements/base.txt # -r requirements/base.txt # ape-pie # codecov @@ -537,17 +630,27 @@ requests==2.32.3 # zgw-consumers requests-mock==1.12.1 # via + # -c requirements/base.txt # -r requirements/base.txt # -r requirements/test-tools.in # commonground-api-common sentry-sdk==2.12.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework +setuptools==75.6.0 + # via + # -c requirements/base.txt + # -r requirements/base.txt + # josepy sharing-configs==0.1.2 - # via -r requirements/base.txt + # via + # -c requirements/base.txt + # -r requirements/base.txt six==1.16.0 # via + # -c requirements/base.txt # -r requirements/base.txt # bleach # click-repl @@ -560,16 +663,19 @@ soupsieve==2.4.1 # via beautifulsoup4 sqlparse==0.5.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django tblib==1.7.0 # via -r requirements/test-tools.in -tornado==6.4.1 +tornado==6.4.2 # via + # -c requirements/base.txt # -r requirements/base.txt # flower typing-extensions==4.11.0 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc-db # pydantic @@ -577,44 +683,52 @@ typing-extensions==4.11.0 # zgw-consumers tzdata==2024.1 # via + # -c requirements/base.txt # -r requirements/base.txt # celery uritemplate==4.1.1 # via + # -c requirements/base.txt # -r requirements/base.txt # coreapi # drf-spectacular # drf-yasg urllib3==2.2.2 # via + # -c requirements/base.txt # -r requirements/base.txt # elastic-apm # requests # sentry-sdk uwsgi==2.0.24 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework vcrpy==6.0.1 # via -r requirements/test-tools.in vine==5.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # amqp # celery # kombu -waitress==2.1.2 +waitress==3.0.1 # via webtest wcwidth==0.2.6 # via + # -c requirements/base.txt # -r requirements/base.txt # prompt-toolkit webauthn==2.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth webencodings==0.5.1 # via + # -c requirements/base.txt # -r requirements/base.txt # bleach webob==1.8.8 @@ -623,6 +737,7 @@ webtest==3.0.0 # via django-webtest wrapt==1.14.1 # via + # -c requirements/base.txt # -r requirements/base.txt # elastic-apm # vcrpy @@ -630,10 +745,8 @@ yarl==1.9.4 # via vcrpy zgw-consumers==0.35.1 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # notifications-api-common # open-api-framework - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/dev.in b/requirements/dev.in index ad0e948..e01fc69 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,3 +1,6 @@ +-c ci.txt +-r ci.txt + # Helpers pip-tools bumpversion diff --git a/requirements/dev.txt b/requirements/dev.txt index 7a4b1c3..0eb7fb4 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,57 +1,67 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-emit-index-url --output-file=requirements/dev.txt requirements/base.txt requirements/dev.in requirements/test-tools.in -# +# This file was autogenerated by uv via the following command: +# ./bin/compile_dependencies.sh alabaster==0.7.13 # via sphinx amqp==5.1.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # kombu annotated-types==0.7.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # pydantic ape-pie==0.1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # notifications-api-common # zgw-consumers asgiref==3.6.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django # django-axes # django-cors-headers asn1crypto==1.5.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # webauthn attrs==23.1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # glom # jsonschema babel==2.12.1 # via sphinx beautifulsoup4==4.12.2 - # via webtest + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # webtest billiard==4.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery -black==24.4.2 - # via -r requirements/test-tools.in +black==24.8.0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt bleach==6.1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework boltons==23.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # face # glom build==0.10.0 @@ -62,31 +72,37 @@ bumpversion==0.6.0 # via -r requirements/dev.in cbor2==5.6.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # webauthn celery==5.4.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # flower # notifications-api-common # open-api-framework certifi==2024.7.4 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # elastic-apm # requests # sentry-sdk cffi==1.15.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # cryptography charset-normalizer==3.1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # requests click==8.1.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # black # celery # click-didyoumean @@ -95,41 +111,61 @@ click==8.1.3 # pip-tools click-didyoumean==0.3.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery click-plugins==1.1.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery click-repl==0.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery +codecov==2.1.13 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt commonground-api-common==2.1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework coreapi==2.3.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common coreschema==0.0.4 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # coreapi +coverage==4.5.4 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # codecov cryptography==42.0.7 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-simple-certmanager # josepy # mozilla-django-oidc # pyopenssl # webauthn cssselect==1.2.0 - # via pyquery -django==4.2.15 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt + # pyquery +django==4.2.17 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # django-admin-index # django-appconf @@ -171,23 +207,28 @@ django==4.2.15 # zgw-consumers django-admin-index==3.1.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-appconf==1.0.6 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-log-outgoing-requests django-axes==6.5.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-cors-headers==4.4.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-csp==3.8 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-debug-toolbar==4.1.0 # via -r requirements/dev.in @@ -195,91 +236,113 @@ django-extensions==3.2.1 # via -r requirements/dev.in django-filter==24.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # open-api-framework django-formtools==2.4.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth django-jsonform==2.22.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc-db # open-api-framework django-jsonsuit==0.5.0 - # via -r requirements/base.txt + # via + # -c requirements/ci.txt + # -r requirements/ci.txt django-log-outgoing-requests==0.6.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-markup==1.8.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-ordered-model==3.7.4 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-admin-index django-otp==1.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth django-phonenumber-field==5.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth django-privates==2.0.0.post0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-simple-certmanager django-redis==5.4.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-relativedelta==2.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # zgw-consumers django-rest-framework-condition==0.1.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common django-sendfile2==0.7.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-privates django-sessionprofile==3.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-setup-configuration==0.5.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-simple-certmanager==2.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # zgw-consumers django-solo==2.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # django-log-outgoing-requests # mozilla-django-oidc-db # notifications-api-common # sharing-configs # zgw-consumers -django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 +django-two-factor-auth==1.16.0 # via - # -r requirements/base.txt - # django-two-factor-auth + # -c requirements/ci.txt + # -r requirements/ci.txt # maykin-2fa django-webtest==1.9.10 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt djangorestframework==3.15.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # djangorestframework-gis # djangorestframework-inclusions @@ -290,16 +353,19 @@ djangorestframework==3.15.2 # open-api-framework djangorestframework-camel-case==1.4.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # notifications-api-common djangorestframework-gis==1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework djangorestframework-inclusions==1.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework docutils==0.18.1 # via @@ -307,234 +373,316 @@ docutils==0.18.1 # sphinx-rtd-theme drf-nested-routers==0.94.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common -drf-spectacular[sidecar]==0.27.2 +drf-spectacular==0.27.2 # via - # -r requirements/base.txt - # drf-spectacular + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework drf-spectacular-sidecar==2024.7.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-spectacular drf-yasg==1.21.7 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common ecs-logging==2.1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # elastic-apm elastic-apm==6.22.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework face==20.1.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # glom factory-boy==3.2.1 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt faker==18.9.0 - # via factory-boy -flake8==6.0.0 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # factory-boy +flake8==7.1.1 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt flower==2.0.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework freezegun==1.2.2 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt furl==2.1.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # ape-pie glom==23.3.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc-db humanize==4.9.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # flower idna==3.7 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # requests # yarl imagesize==1.4.1 # via sphinx inflection==0.5.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-spectacular # drf-yasg iso-639==0.4.5 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common isodate==0.6.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common -isort==5.12.0 - # via -r requirements/test-tools.in +isort==5.13.2 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt itypes==1.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # coreapi -jinja2==3.1.4 +jinja2==3.1.5 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # coreschema # sphinx josepy==1.13.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc jsonschema==4.17.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-spectacular kombu==5.3.5 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery lxml==4.9.2 - # via pyquery + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pyquery markupsafe==2.1.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # jinja2 maykin-2fa==1.0.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework mccabe==0.7.0 - # via flake8 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # flake8 mozilla-django-oidc==4.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc-db -mozilla-django-oidc-db[django-setup-configuration]==0.21.1 +mozilla-django-oidc-db==0.21.1 # via - # -r requirements/base.txt - # mozilla-django-oidc-db + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework multidict==6.0.5 - # via yarl + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # yarl mypy-extensions==1.0.0 - # via black + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # black notifications-api-common==0.3.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common -open-api-framework==0.9.1 - # via -r requirements/base.txt +open-api-framework==0.9.2 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt orderedmultidict==1.0.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # furl oyaml==1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common packaging==23.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # black # build # drf-yasg # sphinx -pathspec==0.11.1 - # via black +pathspec==0.12.1 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # black phonenumberslite==8.13.30 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth +pip==24.3.1 + # via pip-tools pip-tools==7.3.0 # via -r requirements/dev.in -platformdirs==3.5.1 - # via black +platformdirs==4.3.6 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # black prometheus-client==0.20.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # flower prompt-toolkit==3.0.38 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # click-repl psycopg2==2.9.9 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework -pycodestyle==2.10.0 - # via flake8 +pycodestyle==2.12.1 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # flake8 pycparser==2.21 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # cffi pydantic==2.9.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-setup-configuration # pydantic-settings pydantic-core==2.23.4 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # pydantic -pydantic-settings[yaml]==2.6.1 +pydantic-settings==2.6.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-setup-configuration - # pydantic-settings -pyflakes==3.0.1 - # via flake8 +pyflakes==3.2.0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # flake8 pygments==2.15.1 # via sphinx pyjwt==2.7.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # zgw-consumers pyopenssl==24.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # josepy # webauthn pyproject-hooks==1.0.0 # via build pyquery==2.0.0 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt pyrsistent==0.19.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # jsonschema python-dateutil==2.8.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery # django-relativedelta # faker # freezegun python-decouple==3.8 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework python-dotenv==1.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework # pydantic-settings pytz==2023.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-yasg # flower pyyaml==6.0.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-spectacular # drf-yasg # oyaml @@ -542,16 +690,20 @@ pyyaml==6.0.2 # vcrpy qrcode==6.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth redis==4.5.5 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-redis requests==2.32.3 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # ape-pie + # codecov # commonground-api-common # coreapi # django-log-outgoing-requests @@ -563,18 +715,28 @@ requests==2.32.3 # zgw-consumers requests-mock==1.12.1 # via - # -r requirements/base.txt - # -r requirements/test-tools.in + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common sentry-sdk==2.12.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework +setuptools==75.6.0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # josepy + # pip-tools sharing-configs==0.1.2 - # via -r requirements/base.txt + # via + # -c requirements/ci.txt + # -r requirements/ci.txt six==1.16.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # bleach # click-repl # furl @@ -585,7 +747,10 @@ six==1.16.0 snowballstemmer==2.2.0 # via sphinx soupsieve==2.4.1 - # via beautifulsoup4 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # beautifulsoup4 sphinx==6.2.1 # via # -r requirements/dev.in @@ -609,84 +774,109 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlparse==0.5.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django # django-debug-toolbar tblib==1.7.0 - # via -r requirements/test-tools.in -tornado==6.4.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt +tornado==6.4.2 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt # flower typing-extensions==4.11.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc-db # pydantic # pydantic-core # zgw-consumers tzdata==2024.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery uritemplate==4.1.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # coreapi # drf-spectacular # drf-yasg urllib3==2.2.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # elastic-apm # requests # sentry-sdk uwsgi==2.0.24 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework vcrpy==6.0.1 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt vine==5.1.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # amqp # celery # kombu -waitress==2.1.2 - # via webtest +waitress==3.0.1 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # webtest wcwidth==0.2.6 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # prompt-toolkit webauthn==2.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth webencodings==0.5.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # bleach webob==1.8.8 - # via webtest + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # webtest webtest==3.0.0 - # via django-webtest + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # django-webtest wheel==0.40.0 # via pip-tools wrapt==1.14.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # elastic-apm # vcrpy yarl==1.9.4 - # via vcrpy + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # vcrpy zgw-consumers==0.35.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # notifications-api-common # open-api-framework - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements/test-tools.in b/requirements/test-tools.in index 850fe83..ea3a298 100644 --- a/requirements/test-tools.in +++ b/requirements/test-tools.in @@ -1,3 +1,6 @@ +-c base.txt +-r base.txt + # Dependencies only relevant for (unit) testing django-webtest factory-boy @@ -6,6 +9,8 @@ pyquery # integrates with webtest requests-mock tblib vcrpy +codecov +coverage # Code formatting black