From e378735c1224db3d3205304aa036ec14b9e65468 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Fri, 3 Jan 2025 10:34:09 +0100 Subject: [PATCH 1/3] :hammer: [maykinmedia/open-api-framework#81] Switch from pip-compile to UV --- .github/workflows/oaf-check.yml | 2 +- bin/compile_dependencies.sh | 37 +- requirements/base.txt | 14 +- requirements/ci.in | 2 - requirements/ci.txt | 149 +++++++- requirements/dev.in | 3 + requirements/dev.txt | 619 +++++++++++++++++++++++--------- requirements/docs.in | 9 + requirements/test-tools.in | 12 +- 9 files changed, 610 insertions(+), 237 deletions(-) delete mode 100644 requirements/ci.in create mode 100644 requirements/docs.in diff --git a/.github/workflows/oaf-check.yml b/.github/workflows/oaf-check.yml index c14e5f9b..6124b912 100644 --- a/.github/workflows/oaf-check.yml +++ b/.github/workflows/oaf-check.yml @@ -14,7 +14,7 @@ on: jobs: open-api-workflow-check-oas: - uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@v2 + uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@v4 with: python-version: '3.11' diff --git a/bin/compile_dependencies.sh b/bin/compile_dependencies.sh index e7409786..6e3dda11 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,39 +6,33 @@ # # ./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 -toplevel=$(git rev-parse --show-toplevel) +command -v uv || (echo "uv not found on PATH. Install it https://astral.sh/uv" >&2 && exit 1) -cd $toplevel +root_dir=$(git rev-parse --show-toplevel) -export CUSTOM_COMPILE_COMMAND="./bin/compile_dependencies.sh" +export UV_CUSTOM_COMPILE_COMMAND="./bin/compile_dependencies.sh" # Base (& prod) deps -pip-compile \ - --no-emit-index-url \ +uv pip compile \ + --output-file "$root_dir/requirements/base.txt" \ "$@" \ - requirements/base.in + "$root_dir/requirements/base.in" # Dependencies for testing -pip-compile \ - --no-emit-index-url \ - --output-file requirements/ci.txt \ +uv pip compile \ + --output-file "$root_dir/requirements/ci.txt" \ "$@" \ - requirements/base.txt \ - requirements/test-tools.in \ - requirements/ci.in + "$root_dir/requirements/test-tools.in" \ + "$root_dir/requirements/docs.in" # Dev depedencies - exact same set as CI + some extra tooling -pip-compile \ - --no-emit-index-url \ - --output-file requirements/dev.txt \ +uv pip compile \ + --output-file "$root_dir/requirements/dev.txt" \ "$@" \ - requirements/base.txt \ - requirements/test-tools.in \ - requirements/dev.in + "$root_dir/requirements/dev.in" diff --git a/requirements/base.txt b/requirements/base.txt index 3236e673..769ace22 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: -# +# This file was autogenerated by uv via the following command: # ./bin/compile_dependencies.sh -# amqp==5.2.0 # via kombu annotated-types==0.7.0 @@ -167,7 +163,7 @@ django-solo==2.3.0 # mozilla-django-oidc-db # notifications-api-common # 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 @@ -189,7 +185,7 @@ djangorestframework-inclusions==1.2.0 # via open-api-framework drf-nested-routers==0.94.1 # via commonground-api-common -drf-spectacular[sidecar]==0.27.2 +drf-spectacular==0.27.2 # via open-api-framework drf-spectacular-sidecar==2024.7.1 # via drf-spectacular @@ -237,7 +233,7 @@ maykin-2fa==1.0.1 # via open-api-framework mozilla-django-oidc==4.0.1 # via mozilla-django-oidc-db -mozilla-django-oidc-db[setup-configuration]==0.21.1 +mozilla-django-oidc-db==0.21.1 # via # -r requirements/base.in # open-api-framework @@ -267,7 +263,7 @@ pydantic==2.10.2 # pydantic-settings pydantic-core==2.27.1 # via pydantic -pydantic-settings[yaml]==2.6.1 +pydantic-settings==2.6.1 # via django-setup-configuration pyjwt==2.9.0 # via diff --git a/requirements/ci.in b/requirements/ci.in deleted file mode 100644 index 76375907..00000000 --- a/requirements/ci.in +++ /dev/null @@ -1,2 +0,0 @@ -codecov -pytest diff --git a/requirements/ci.txt b/requirements/ci.txt index b5287598..e10351de 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,39 +1,41 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# +# This file was autogenerated by uv via the following command: # ./bin/compile_dependencies.sh -# alabaster==0.7.16 # via sphinx amqp==5.2.0 # 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.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # notifications-api-common # zgw-consumers asgiref==3.8.1 # 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 astroid==3.2.4 # via pylint attrs==23.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # glom # jsonschema @@ -44,45 +46,54 @@ beautifulsoup4==4.12.3 # via webtest billiard==4.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # celery black==24.4.2 # via -r requirements/test-tools.in bleach==6.1.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework boltons==24.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # face # glom cbor2==5.6.4 # 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.16.0 # via + # -c requirements/base.txt # -r requirements/base.txt # cryptography charset-normalizer==3.3.2 # via + # -c requirements/base.txt # -r requirements/base.txt # requests click==8.1.7 # via + # -c requirements/base.txt # -r requirements/base.txt # black # celery @@ -91,36 +102,43 @@ click==8.1.7 # click-repl click-didyoumean==0.3.1 # 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.3.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.2 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework commonmark==0.9.1 # via recommonmark 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 codecov cryptography==43.0.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django-simple-certmanager # josepy @@ -133,6 +151,7 @@ dill==0.3.8 # via pylint django==4.2.15 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # django-admin-index @@ -171,107 +190,130 @@ 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.5.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-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.5.1 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth django-phonenumber-field==7.3.0 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth django-privates==2.0.0.post1 # 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.1 # 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.4.0 # via + # -c requirements/base.txt # -r requirements/base.txt - # mozilla-django-oidc-db # open-api-framework django-simple-certmanager==2.3.0 # via + # -c requirements/base.txt # -r requirements/base.txt # zgw-consumers django-solo==2.3.0 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # django-log-outgoing-requests # mozilla-django-oidc-db # notifications-api-common # 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 # maykin-2fa django-webtest==1.9.11 # via -r requirements/test-tools.in djangorestframework==3.15.2 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # djangorestframework-gis @@ -283,15 +325,18 @@ 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 docutils==0.20.1 @@ -302,30 +347,37 @@ docutils==0.20.1 # sphinx-tabs 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 # 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.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # elastic-apm elastic-apm==6.23.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.3.0 @@ -336,24 +388,29 @@ flake8==7.1.0 # via -r requirements/test-tools.in flower==2.0.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework freezegun==1.5.1 # via -r requirements/test-tools.in furl==2.1.3 # via + # -c requirements/base.txt # -r requirements/base.txt # ape-pie glom==23.5.0 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc-db humanize==4.10.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 @@ -361,6 +418,7 @@ imagesize==1.4.1 # via sphinx inflection==0.5.1 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-spectacular # drf-yasg @@ -368,10 +426,12 @@ iniconfig==2.0.0 # via pytest 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 @@ -380,27 +440,33 @@ isort==5.13.2 # pylint itypes==1.2.0 # via + # -c requirements/base.txt # -r requirements/base.txt # coreapi jinja2==3.1.4 # via + # -c requirements/base.txt # -r requirements/base.txt # coreschema # sphinx josepy==1.14.0 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc jsonschema==4.23.0 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-spectacular jsonschema-specifications==2023.12.1 # via + # -c requirements/base.txt # -r requirements/base.txt # jsonschema kombu==5.3.7 # via + # -c requirements/base.txt # -r requirements/base.txt # celery lxml==5.2.2 @@ -409,10 +475,12 @@ markdown==3.6 # via sphinx-markdown-tables markupsafe==2.1.5 # 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 @@ -421,10 +489,12 @@ mccabe==0.7.0 # pylint mozilla-django-oidc==4.0.1 # via + # -c requirements/base.txt # -r requirements/base.txt # mozilla-django-oidc-db -mozilla-django-oidc-db[setup-configuration]==0.21.1 +mozilla-django-oidc-db==0.21.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework multidict==6.0.5 @@ -433,20 +503,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 + # 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==24.1 # via + # -c requirements/base.txt # -r requirements/base.txt # black # drf-yasg @@ -458,6 +534,7 @@ pep8==1.7.1 # via -r requirements/test-tools.in phonenumberslite==8.13.42 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth platformdirs==4.2.2 @@ -468,33 +545,40 @@ pluggy==1.5.0 # via pytest prometheus-client==0.20.0 # via + # -c requirements/base.txt # -r requirements/base.txt # flower prompt-toolkit==3.0.47 # 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.0 # via flake8 pycparser==2.22 # via + # -c requirements/base.txt # -r requirements/base.txt # cffi pydantic==2.10.2 # via + # -c requirements/base.txt # -r requirements/base.txt # django-setup-configuration # pydantic-settings pydantic-core==2.27.1 # 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 pyflakes==3.2.0 @@ -505,6 +589,7 @@ pygments==2.18.0 # sphinx-tabs pyjwt==2.9.0 # via + # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common # zgw-consumers @@ -512,19 +597,22 @@ pylint==3.2.6 # via -r requirements/test-tools.in pyopenssl==24.2.1 # via + # -c requirements/base.txt # -r requirements/base.txt # josepy # webauthn pypng==0.20220715.0 # via + # -c requirements/base.txt # -r requirements/base.txt # qrcode pyquery==2.0.0 # via -r requirements/test-tools.in pytest==8.3.3 - # via -r requirements/ci.in + # via -r requirements/test-tools.in python-dateutil==2.9.0.post0 # via + # -c requirements/base.txt # -r requirements/base.txt # celery # django-relativedelta @@ -532,20 +620,24 @@ python-dateutil==2.9.0.post0 # freezegun python-decouple==3.8 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework python-dotenv==1.0.1 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework # pydantic-settings pytz==2024.1 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-yasg # flower pyyaml==6.0.1 # via + # -c requirements/base.txt # -r requirements/base.txt # drf-spectacular # drf-yasg @@ -554,21 +646,25 @@ pyyaml==6.0.1 # vcrpy qrcode==7.4.2 # via + # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth recommonmark==0.7.1 - # via -r requirements/test-tools.in + # via -r requirements/docs.in redis==5.0.8 # via + # -c requirements/base.txt # -r requirements/base.txt # django-redis referencing==0.35.1 # via + # -c requirements/base.txt # -r requirements/base.txt # jsonschema # jsonschema-specifications requests==2.32.3 # via + # -c requirements/base.txt # -r requirements/base.txt # ape-pie # codecov @@ -582,20 +678,24 @@ 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 rpds-py==0.19.1 # via + # -c requirements/base.txt # -r requirements/base.txt # jsonschema # referencing sentry-sdk==2.12.0 # via + # -c requirements/base.txt # -r requirements/base.txt # open-api-framework six==1.16.0 # via + # -c requirements/base.txt # -r requirements/base.txt # bleach # furl @@ -608,17 +708,17 @@ soupsieve==2.5 # via beautifulsoup4 sphinx==7.4.7 # via - # -r requirements/test-tools.in + # -r requirements/docs.in # recommonmark # sphinx-rtd-theme # sphinx-tabs # sphinxcontrib-jquery sphinx-markdown-tables==0.0.17 - # via -r requirements/test-tools.in + # via -r requirements/docs.in sphinx-rtd-theme==2.0.0 - # via -r requirements/test-tools.in + # via -r requirements/docs.in sphinx-tabs==3.4.5 - # via -r requirements/test-tools.in + # via -r requirements/docs.in sphinxcontrib-applehelp==2.0.0 # via sphinx sphinxcontrib-devhelp==2.0.0 @@ -635,6 +735,7 @@ sphinxcontrib-serializinghtml==2.0.0 # via sphinx sqlparse==0.5.1 # via + # -c requirements/base.txt # -r requirements/base.txt # django tblib==3.0.0 @@ -643,10 +744,12 @@ tomlkit==0.13.0 # via pylint tornado==6.4.1 # via + # -c requirements/base.txt # -r requirements/base.txt # flower typing-extensions==4.12.2 # via + # -c requirements/base.txt # -r requirements/base.txt # faker # mozilla-django-oidc-db @@ -656,28 +759,33 @@ typing-extensions==4.12.2 # 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.26 # 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 @@ -688,14 +796,17 @@ waitress==3.0.0 # webtest wcwidth==0.2.13 # via + # -c requirements/base.txt # -r requirements/base.txt # prompt-toolkit webauthn==2.2.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 @@ -704,6 +815,7 @@ webtest==3.0.0 # via django-webtest wrapt==1.16.0 # via + # -c requirements/base.txt # -r requirements/base.txt # elastic-apm # vcrpy @@ -711,6 +823,7 @@ 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 diff --git a/requirements/dev.in b/requirements/dev.in index cd67c099..768b06b4 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,3 +1,6 @@ +-c ci.txt +-r ci.txt + # Helpers pip-tools gitpython diff --git a/requirements/dev.txt b/requirements/dev.txt index 2d5a7458..11cc983f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,60 +1,79 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# +# This file was autogenerated by uv via the following command: # ./bin/compile_dependencies.sh -# alabaster==0.7.16 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx amqp==5.2.0 # 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.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # notifications-api-common # zgw-consumers asgiref==3.8.1 # 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 astroid==3.2.4 - # via pylint + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pylint attrs==23.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # glom # jsonschema # referencing babel==2.15.0 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx beautifulsoup4==4.12.3 - # 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 + # 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==24.0.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # face # glom build==1.2.1 @@ -63,31 +82,37 @@ bump2version==1.0.1 # via -r requirements/dev.in cbor2==5.6.4 # 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.16.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # cryptography charset-normalizer==3.3.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # requests click==8.1.7 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # black # celery # click-didyoumean @@ -96,45 +121,71 @@ click==8.1.7 # pip-tools click-didyoumean==0.3.1 # 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.3.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.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework commonmark==0.9.1 - # via recommonmark + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # recommonmark 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==43.0.0 # 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 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pyquery dill==0.3.8 - # via pylint + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pylint django==4.2.15 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # django-admin-index # django-appconf @@ -174,23 +225,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.4.6 # via -r requirements/dev.in @@ -198,88 +254,108 @@ django-extensions==3.2.3 # 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.5.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-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.5.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth django-phonenumber-field==7.3.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth django-privates==2.0.0.post1 # 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.1 # 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.4.0 # via - # -r requirements/base.txt - # mozilla-django-oidc-db + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework django-simple-certmanager==2.3.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # zgw-consumers django-solo==2.3.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 # zgw-consumers -django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 +django-two-factor-auth==1.16.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # maykin-2fa django-webtest==1.9.11 - # 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,66 +366,89 @@ 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.20.1 # via + # -c requirements/ci.txt + # -r requirements/ci.txt # recommonmark # sphinx # sphinx-rtd-theme # sphinx-tabs 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 + # -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.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # elastic-apm elastic-apm==6.23.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.3.0 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt faker==32.1.0 - # via factory-boy + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # factory-boy flake8==7.1.0 - # via -r requirements/test-tools.in + # 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.5.1 - # 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 gitdb==4.0.11 # via gitpython @@ -357,207 +456,299 @@ gitpython==3.1.43 # via -r requirements/dev.in glom==23.5.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc-db humanize==4.10.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 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx inflection==0.5.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-spectacular # drf-yasg +iniconfig==2.0.0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pytest 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.13.2 # via - # -r requirements/test-tools.in + # -c requirements/ci.txt + # -r requirements/ci.txt # pylint itypes==1.2.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # coreapi jinja2==3.1.4 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # coreschema # sphinx josepy==1.14.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc jsonschema==4.23.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-spectacular jsonschema-specifications==2023.12.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # jsonschema kombu==5.3.7 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # celery lxml==5.2.2 - # via pyquery + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pyquery markdown==3.6 - # via sphinx-markdown-tables + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx-markdown-tables markupsafe==2.1.5 # 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 + # -c requirements/ci.txt + # -r requirements/ci.txt # flake8 # pylint mozilla-django-oidc==4.0.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # mozilla-django-oidc-db -mozilla-django-oidc-db[setup-configuration]==0.21.1 +mozilla-django-oidc-db==0.21.1 # via - # -r requirements/base.txt + # -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 + # 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==24.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # black # build # drf-yasg + # pytest # sphinx pathspec==0.12.1 - # via black + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # black pep8==1.7.1 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt phonenumberslite==8.13.42 # 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.4.1 # via -r requirements/dev.in platformdirs==4.2.2 # via + # -c requirements/ci.txt + # -r requirements/ci.txt # black # pylint +pluggy==1.5.0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pytest prometheus-client==0.20.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # flower prompt-toolkit==3.0.47 # 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.12.0 - # via flake8 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # flake8 pycparser==2.22 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # cffi pydantic==2.10.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-setup-configuration # pydantic-settings pydantic-core==2.27.1 # 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 pyflakes==3.2.0 - # via flake8 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # flake8 pygments==2.18.0 # via + # -c requirements/ci.txt + # -r requirements/ci.txt # sphinx # sphinx-tabs pyjwt==2.9.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # commonground-api-common # zgw-consumers pylint==3.2.6 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt pyopenssl==24.2.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # josepy # webauthn pypng==0.20220715.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # qrcode pyproject-hooks==1.1.0 # via # build # pip-tools pyquery==2.0.0 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt +pytest==8.3.3 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt python-dateutil==2.9.0.post0 # 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.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # open-api-framework # pydantic-settings pytz==2024.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-yasg # flower pyyaml==6.0.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # drf-spectacular # drf-yasg # oyaml @@ -565,23 +756,30 @@ pyyaml==6.0.1 # vcrpy qrcode==7.4.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-two-factor-auth recommonmark==0.7.1 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt redis==5.0.8 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django-redis referencing==0.35.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # jsonschema # jsonschema-specifications 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 @@ -592,21 +790,26 @@ 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 rpds-py==0.19.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # jsonschema # referencing 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 pip-tools six==1.16.0 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # bleach # furl # isodate @@ -615,52 +818,94 @@ six==1.16.0 smmap==5.0.1 # via gitdb snowballstemmer==2.2.0 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx soupsieve==2.5 - # via beautifulsoup4 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # beautifulsoup4 sphinx==7.4.7 # via - # -r requirements/test-tools.in + # -c requirements/ci.txt + # -r requirements/ci.txt # recommonmark # sphinx-rtd-theme # sphinx-tabs # sphinxcontrib-jquery sphinx-markdown-tables==0.0.17 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt sphinx-rtd-theme==2.0.0 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt sphinx-tabs==3.4.5 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt sphinxcontrib-applehelp==2.0.0 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx sphinxcontrib-devhelp==2.0.0 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx sphinxcontrib-htmlhelp==2.1.0 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx sphinxcontrib-jquery==4.1 - # via sphinx-rtd-theme + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx sphinxcontrib-qthelp==2.0.0 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx sphinxcontrib-serializinghtml==2.0.0 - # via sphinx + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # sphinx sqlparse==0.5.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # django # django-debug-toolbar tblib==3.0.0 - # via -r requirements/test-tools.in + # via + # -c requirements/ci.txt + # -r requirements/ci.txt tomlkit==0.13.0 - # via pylint + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # pylint tornado==6.4.1 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # flower typing-extensions==4.12.2 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # faker # mozilla-django-oidc-db # pydantic @@ -669,68 +914,86 @@ typing-extensions==4.12.2 # 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.26 # 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==3.0.0 # via - # -r requirements/test-tools.in + # -c requirements/ci.txt + # -r requirements/ci.txt # webtest wcwidth==0.2.13 # via - # -r requirements/base.txt + # -c requirements/ci.txt + # -r requirements/ci.txt # prompt-toolkit webauthn==2.2.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.43.0 # via pip-tools wrapt==1.16.0 # 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/docs.in b/requirements/docs.in new file mode 100644 index 00000000..23f29dde --- /dev/null +++ b/requirements/docs.in @@ -0,0 +1,9 @@ +-c base.txt +-r base.txt + +# Documentation +sphinx +sphinx_rtd_theme +recommonmark +sphinx-markdown-tables +sphinx-tabs diff --git a/requirements/test-tools.in b/requirements/test-tools.in index d5a4403d..1b186d3a 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 @@ -9,15 +12,10 @@ requests-mock tblib vcrpy waitress>=2.1.1 +codecov +pytest # Code formatting black isort flake8 - -# Documentation -sphinx -sphinx_rtd_theme -recommonmark -sphinx-markdown-tables -sphinx-tabs From c6a0c474f487f8ec42bfa772be61bea883204097 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Fri, 3 Jan 2025 10:34:41 +0100 Subject: [PATCH 2/3] :arrow_up: [maykinmedia/open-api-framework#93] Security updates --- requirements/base.txt | 8 ++++---- requirements/ci.txt | 10 +++++----- requirements/dev.txt | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 769ace22..9b55a473 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -70,7 +70,7 @@ cryptography==43.0.0 # mozilla-django-oidc # pyopenssl # webauthn -django==4.2.15 +django==4.2.17 # via # commonground-api-common # django-admin-index @@ -217,7 +217,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.14.0 # via mozilla-django-oidc @@ -239,7 +239,7 @@ mozilla-django-oidc-db==0.21.1 # 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 @@ -330,7 +330,7 @@ six==1.16.0 # python-dateutil sqlparse==0.5.1 # via django -tornado==6.4.1 +tornado==6.4.2 # via flower typing-extensions==4.12.2 # via diff --git a/requirements/ci.txt b/requirements/ci.txt index e10351de..e11bd608 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -149,7 +149,7 @@ cssselect==1.2.0 # via pyquery dill==0.3.8 # via pylint -django==4.2.15 +django==4.2.17 # via # -c requirements/base.txt # -r requirements/base.txt @@ -443,7 +443,7 @@ itypes==1.2.0 # -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 @@ -506,7 +506,7 @@ notifications-api-common==0.3.1 # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common -open-api-framework==0.9.1 +open-api-framework==0.9.2 # via # -c requirements/base.txt # -r requirements/base.txt @@ -742,7 +742,7 @@ tblib==3.0.0 # via -r requirements/test-tools.in tomlkit==0.13.0 # via pylint -tornado==6.4.1 +tornado==6.4.2 # via # -c requirements/base.txt # -r requirements/base.txt @@ -790,7 +790,7 @@ vine==5.1.0 # amqp # celery # kombu -waitress==3.0.0 +waitress==3.0.1 # via # -r requirements/test-tools.in # webtest diff --git a/requirements/dev.txt b/requirements/dev.txt index 11cc983f..d4c28599 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -182,7 +182,7 @@ dill==0.3.8 # -c requirements/ci.txt # -r requirements/ci.txt # pylint -django==4.2.15 +django==4.2.17 # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -506,7 +506,7 @@ itypes==1.2.0 # -c requirements/ci.txt # -r requirements/ci.txt # coreapi -jinja2==3.1.4 +jinja2==3.1.5 # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -583,7 +583,7 @@ notifications-api-common==0.3.1 # -c requirements/ci.txt # -r requirements/ci.txt # commonground-api-common -open-api-framework==0.9.1 +open-api-framework==0.9.2 # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -897,7 +897,7 @@ tomlkit==0.13.0 # -c requirements/ci.txt # -r requirements/ci.txt # pylint -tornado==6.4.1 +tornado==6.4.2 # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -947,7 +947,7 @@ vine==5.1.0 # amqp # celery # kombu -waitress==3.0.0 +waitress==3.0.1 # via # -c requirements/ci.txt # -r requirements/ci.txt From 7fa9317ee17ebb74197fdf80c56a31813ade02c3 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Mon, 6 Jan 2025 09:22:27 +0100 Subject: [PATCH 3/3] :construction_worker: Do not run OAF version check on PR open because the action now creates PRs, which might result in a loop --- .github/workflows/oaf-check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/oaf-check.yml b/.github/workflows/oaf-check.yml index 6124b912..cdf6b02f 100644 --- a/.github/workflows/oaf-check.yml +++ b/.github/workflows/oaf-check.yml @@ -6,7 +6,6 @@ on: - master tags: - '*' - pull_request: workflow_dispatch: schedule: - cron: '0 7 * * 1'