diff --git a/backend/bin/compile_dependencies.sh b/backend/bin/compile_dependencies.sh index 112c72b45..404d20ca1 100755 --- a/backend/bin/compile_dependencies.sh +++ b/backend/bin/compile_dependencies.sh @@ -8,19 +8,19 @@ cd $toplevel/backend # Base (& prod) deps pip-compile \ - --no-index \ + --no-emit-index-url \ requirements/base.in # Dependencies for testing pip-compile \ - --no-index \ + --no-emit-index-url \ --output-file requirements/ci.txt \ requirements/base.txt \ requirements/test-tools.in # Dev depedencies - exact same set as CI + some extra tooling pip-compile \ - --no-index \ + --no-emit-index-url \ --output-file requirements/dev.txt \ requirements/ci.txt \ requirements/dev.in diff --git a/backend/requirements/base.txt b/backend/requirements/base.txt index d9194422a..67025293e 100644 --- a/backend/requirements/base.txt +++ b/backend/requirements/base.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --no-index requirements/base.in +# pip-compile --no-emit-index-url requirements/base.in # aiodns==2.0.0 # via -r requirements/base.in -aiohttp==3.6.1 +aiohttp==3.7.4.post0 # via -r requirements/base.in amqp==2.5.1 # via kombu @@ -87,7 +87,7 @@ django-solo==1.1.3 # django-auth-adfs-db # django-camunda # zgw-consumers -django==2.2.16 +django==2.2.19 # via # -r requirements/base.in # django-appconf @@ -108,7 +108,7 @@ django==2.2.16 # zgw-consumers djangorestframework-camel-case==1.2.0 # via -r requirements/base.in -djangorestframework==3.11.0 +djangorestframework==3.12.2 # via # -r requirements/base.in # drf-spectacular @@ -134,9 +134,7 @@ idna==2.8 # requests # yarl importlib-metadata==0.23 - # via - # jsonschema - # kombu + # via kombu inflection==0.3.1 # via # django-camunda @@ -233,6 +231,8 @@ tablib[xlsx]==0.14.0 # django-import-export text-unidecode==1.3 # via faker +typing-extensions==3.7.4.3 + # via aiohttp uritemplate==3.0.1 # via drf-spectacular urllib3==1.25.5 diff --git a/backend/requirements/ci.txt b/backend/requirements/ci.txt index 67967628e..0114e8882 100644 --- a/backend/requirements/ci.txt +++ b/backend/requirements/ci.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --no-index --output-file=requirements/ci.txt requirements/base.txt requirements/test-tools.in +# pip-compile --no-emit-index-url --output-file=requirements/ci.txt requirements/base.txt requirements/test-tools.in # aiodns==2.0.0 # via -r requirements/base.txt -aiohttp==3.6.1 +aiohttp==3.7.4.post0 # via -r requirements/base.txt amqp==2.5.1 # via @@ -128,7 +128,7 @@ django-solo==1.1.3 # zgw-consumers django-webtest==1.9.7 # via -r requirements/test-tools.in -django==2.2.16 +django==2.2.19 # via # -r requirements/base.txt # django-appconf @@ -149,7 +149,7 @@ django==2.2.16 # zgw-consumers djangorestframework-camel-case==1.2.0 # via -r requirements/base.txt -djangorestframework==3.11.0 +djangorestframework==3.12.2 # via # -r requirements/base.txt # drf-spectacular @@ -189,7 +189,6 @@ idna==2.8 importlib-metadata==0.23 # via # -r requirements/base.txt - # jsonschema # kombu inflection==0.3.1 # via @@ -346,7 +345,10 @@ toml==0.10.2 typed-ast==1.4.1 # via black typing-extensions==3.7.4.3 - # via black + # via + # -r requirements/base.txt + # aiohttp + # black uritemplate==3.0.1 # via # -r requirements/base.txt diff --git a/backend/requirements/dev.in b/backend/requirements/dev.in index e145a1efc..cc19b22bc 100644 --- a/backend/requirements/dev.in +++ b/backend/requirements/dev.in @@ -1,5 +1,5 @@ # Helpers -pip-tools +pip-tools~=5.0 bumpversion # Debug tooling diff --git a/backend/requirements/dev.txt b/backend/requirements/dev.txt index 711c44bf3..cd736c3d6 100644 --- a/backend/requirements/dev.txt +++ b/backend/requirements/dev.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --no-index --output-file=requirements/dev.txt requirements/ci.txt requirements/dev.in +# pip-compile --no-emit-index-url --output-file=requirements/dev.txt requirements/ci.txt requirements/dev.in # aiodns==2.0.0 # via -r requirements/ci.txt -aiohttp==3.6.1 +aiohttp==3.7.4.post0 # via -r requirements/ci.txt alabaster==0.7.12 # via sphinx @@ -151,7 +151,7 @@ django-solo==1.1.3 # zgw-consumers django-webtest==1.9.7 # via -r requirements/ci.txt -django==2.2.16 +django==2.2.19 # via # -r requirements/ci.txt # ddt-api-calls @@ -174,7 +174,7 @@ django==2.2.16 # zgw-consumers djangorestframework-camel-case==1.2.0 # via -r requirements/ci.txt -djangorestframework==3.11.0 +djangorestframework==3.12.2 # via # -r requirements/ci.txt # drf-spectacular @@ -218,7 +218,6 @@ imagesize==1.2.0 importlib-metadata==0.23 # via # -r requirements/ci.txt - # jsonschema # kombu inflection==0.3.1 # via @@ -430,6 +429,7 @@ typed-ast==1.4.1 typing-extensions==3.7.4.3 # via # -r requirements/ci.txt + # aiohttp # black uritemplate==3.0.1 # via