From e183785225af0efa7c40e441d14884f88507c303 Mon Sep 17 00:00:00 2001 From: Thibault Jouannic Date: Mon, 21 Aug 2023 10:46:28 +0200 Subject: [PATCH 1/2] Run `pip-compile --upgrade` on all dependencies We had to pin the `urllib3` dependencies because of this issue: https://github.com/boto/botocore/issues/2926 --- requirements/base.in | 4 + requirements/base.txt | 84 ++++++++-------- requirements/local.txt | 191 +++++++++++++++++------------------- requirements/production.txt | 108 ++++++++++---------- 4 files changed, 186 insertions(+), 201 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 92d8ba278..624544ac6 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,4 +1,5 @@ django<=4.2 +urllib3<2 django-environ django-model-utils django-allauth @@ -23,3 +24,6 @@ django-braces shapely pyproj django-localflavor + +# See this link for the urllib3 version pin +# https://github.com/boto/botocore/issues/2926 diff --git a/requirements/base.txt b/requirements/base.txt index f2246ae5b..1a1c31506 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,26 +1,24 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile base.in # amqp==5.1.1 # via kombu -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 # via -r base.in argon2-cffi-bindings==21.2.0 # via argon2-cffi -asgiref==3.6.0 +asgiref==3.7.2 # via django -async-timeout==4.0.2 - # via redis -billiard==3.6.4.0 +billiard==4.1.0 # via celery build==0.10.0 # via pip-tools -celery==5.2.7 +celery==5.3.1 # via -r base.in -certifi==2022.12.7 +certifi==2023.7.22 # via # pyproj # requests @@ -28,9 +26,9 @@ cffi==1.15.1 # via # argon2-cffi-bindings # cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.7 # via # celery # click-didyoumean @@ -41,9 +39,9 @@ click-didyoumean==0.3.0 # via celery click-plugins==1.1.1 # via celery -click-repl==0.2.0 +click-repl==0.3.0 # via celery -cryptography==40.0.1 +cryptography==41.0.3 # via pyjwt defusedxml==0.7.1 # via python3-openid @@ -65,73 +63,73 @@ django-appconf==1.0.5 # via django-compressor django-braces==1.15.0 # via -r base.in -django-compressor==4.3.1 +django-compressor==4.4 # via -r base.in django-crispy-forms==2.0 # via -r base.in django-environ==0.10.0 # via -r base.in -django-leaflet==0.28.3 +django-leaflet==0.29.0 # via -r base.in -django-localflavor==3.1 +django-localflavor==4.0 # via -r base.in django-model-utils==4.3.1 # via -r base.in -django-phonenumber-field[phonenumbers]==7.0.2 +django-phonenumber-field[phonenumbers]==7.1.0 # via -r base.in -django-ratelimit==4.0.0 +django-ratelimit==4.1.0 # via -r base.in -django-redis==5.2.0 +django-redis==5.3.0 # via -r base.in -hiredis==2.2.2 +hiredis==2.2.3 # via -r base.in idna==3.4 # via requests -kombu==5.2.4 +kombu==5.3.1 # via celery -markdown==3.4.3 +markdown==3.4.4 # via -r base.in -numpy==1.24.2 +numpy==1.25.2 # via shapely oauthlib==3.2.2 # via requests-oauthlib packaging==23.1 # via build -phonenumbers==8.13.9 +phonenumbers==8.13.18 # via django-phonenumber-field -pillow==9.5.0 +pillow==10.0.0 # via -r base.in -pip-tools==6.13.0 +pip-tools==7.3.0 # via -r base.in -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via click-repl pycparser==2.21 # via cffi -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via django-allauth -pyproj==3.5.0 +pyproj==3.6.0 # via -r base.in pyproject-hooks==1.0.0 # via build +python-dateutil==2.8.2 + # via celery python-slugify==8.0.1 # via -r base.in -python-stdnum==1.18 +python-stdnum==1.19 # via django-localflavor python3-openid==3.2.0 # via django-allauth pytz==2023.3 - # via - # -r base.in - # celery + # via -r base.in rcssmin==1.1.1 # via # -r base.in # django-compressor -redis==4.5.4 +redis==5.0.0 # via # -r base.in # django-redis -requests==2.28.2 +requests==2.31.0 # via # django-allauth # requests-oauthlib @@ -142,17 +140,17 @@ rjsmin==1.2.1 shapely==2.0.1 # via -r base.in six==1.16.0 - # via click-repl -sqlparse==0.4.3 + # via python-dateutil +sqlparse==0.4.4 # via django text-unidecode==1.3 # via python-slugify -tomli==2.0.1 +tzdata==2023.3 + # via celery +urllib3==1.26.16 # via - # build - # pyproject-hooks -urllib3==1.26.15 - # via requests + # -r base.in + # requests vine==5.0.0 # via # amqp @@ -160,9 +158,9 @@ vine==5.0.0 # kombu wcwidth==0.2.6 # via prompt-toolkit -wheel==0.40.0 +wheel==0.41.1 # via pip-tools -whitenoise==6.4.0 +whitenoise==6.5.0 # via -r base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/local.txt b/requirements/local.txt index 1524de5ff..6a5bcff74 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile local.in @@ -8,39 +8,35 @@ amqp==5.1.1 # via # -r base.txt # kombu -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 # via -r base.txt argon2-cffi-bindings==21.2.0 # via # -r base.txt # argon2-cffi -asgiref==3.6.0 +asgiref==3.7.2 # via # -r base.txt # django -astroid==2.15.2 +astroid==2.15.6 # via pylint asttokens==2.2.1 # via stack-data -async-timeout==4.0.2 - # via - # -r base.txt - # redis backcall==0.2.0 # via ipython -billiard==3.6.4.0 +billiard==4.1.0 # via # -r base.txt # celery -black==23.3.0 +black==23.7.0 # via -r local.in build==0.10.0 # via # -r base.txt # pip-tools -celery==5.2.7 +celery==5.3.1 # via -r base.txt -certifi==2022.12.7 +certifi==2023.7.22 # via # -r base.txt # pyproj @@ -50,13 +46,13 @@ cffi==1.15.1 # -r base.txt # argon2-cffi-bindings # cryptography -cfgv==3.3.1 +cfgv==3.4.0 # via pre-commit -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r base.txt # requests -click==8.1.3 +click==8.1.7 # via # -r base.txt # black @@ -74,21 +70,21 @@ click-plugins==1.1.1 # via # -r base.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r base.txt # celery colorama==0.4.6 # via djlint -coverage==7.2.3 +coverage==7.3.0 # via # -r local.in # django-coverage-plugin -cryptography==40.0.1 +cryptography==41.0.3 # via # -r base.txt # pyjwt -cssbeautifier==1.14.7 +cssbeautifier==1.14.9 # via djlint decorator==5.1.1 # via @@ -98,9 +94,9 @@ defusedxml==0.7.1 # via # -r base.txt # python3-openid -dill==0.3.6 +dill==0.3.7 # via pylint -distlib==0.3.6 +distlib==0.3.7 # via virtualenv django==4.2 # via @@ -126,65 +122,63 @@ django-appconf==1.0.5 # django-compressor django-braces==1.15.0 # via -r base.txt -django-compressor==4.3.1 +django-compressor==4.4 # via -r base.txt -django-coverage-plugin==3.0.0 +django-coverage-plugin==3.1.0 # via -r local.in django-crispy-forms==2.0 # via -r base.txt -django-debug-toolbar==4.0.0 +django-debug-toolbar==4.2.0 # via -r local.in django-environ==0.10.0 # via -r base.txt -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r local.in -django-leaflet==0.28.3 +django-leaflet==0.29.0 # via -r base.txt -django-localflavor==3.1 +django-localflavor==4.0 # via -r base.txt django-model-utils==4.3.1 # via -r base.txt -django-phonenumber-field[phonenumbers]==7.0.2 +django-phonenumber-field[phonenumbers]==7.1.0 # via -r base.txt -django-ratelimit==4.0.0 +django-ratelimit==4.1.0 # via -r base.txt -django-redis==5.2.0 +django-redis==5.3.0 # via -r base.txt -django-stubs==1.16.0 +django-stubs==4.2.3 # via -r local.in -django-stubs-ext==0.8.0 +django-stubs-ext==4.2.2 # via django-stubs djhtml==3.0.6 # via -r local.in -djlint==1.29.0 +djlint==1.32.1 # via -r local.in editorconfig==0.12.3 # via # cssbeautifier # jsbeautifier -exceptiongroup==1.1.1 - # via pytest executing==1.2.0 # via stack-data -factory-boy==3.2.1 +factory-boy==3.3.0 # via -r local.in -faker==18.4.0 +faker==19.3.0 # via factory-boy -filelock==3.11.0 +filelock==3.12.2 # via virtualenv -flake8==6.0.0 +flake8==6.1.0 # via # -r local.in # flake8-isort flake8-isort==6.0.0 # via -r local.in -hiredis==2.2.2 +hiredis==2.2.3 # via -r base.txt html-tag-names==0.1.2 # via djlint html-void-elements==0.1.0 # via djlint -identify==2.5.22 +identify==2.5.26 # via pre-commit idna==3.4 # via @@ -194,29 +188,29 @@ iniconfig==2.0.0 # via pytest ipdb==0.13.13 # via -r local.in -ipython==8.12.0 +ipython==8.14.0 # via ipdb isort==5.12.0 # via # flake8-isort # pylint -jedi==0.18.2 +jedi==0.19.0 # via ipython -jsbeautifier==1.14.7 +jsbeautifier==1.14.9 # via # cssbeautifier # djlint json5==0.9.14 # via djlint -kombu==5.2.4 +kombu==5.3.1 # via # -r base.txt # celery lazy-object-proxy==1.9.0 # via astroid -markdown==3.4.3 +markdown==3.4.4 # via -r base.txt -markupsafe==2.1.2 +markupsafe==2.1.3 # via werkzeug matplotlib-inline==0.1.6 # via ipython @@ -224,7 +218,7 @@ mccabe==0.7.0 # via # flake8 # pylint -mypy==1.2.0 +mypy==1.5.1 # via # -r local.in # django-stubs @@ -232,9 +226,9 @@ mypy-extensions==1.0.0 # via # black # mypy -nodeenv==1.7.0 +nodeenv==1.8.0 # via pre-commit -numpy==1.24.2 +numpy==1.25.2 # via # -r base.txt # shapely @@ -251,73 +245,73 @@ packaging==23.1 # pytest-sugar parso==0.8.3 # via jedi -pathspec==0.11.1 +pathspec==0.11.2 # via # black # djlint pexpect==4.8.0 # via ipython -phonenumbers==8.13.9 +phonenumbers==8.13.18 # via # -r base.txt # django-phonenumber-field pickleshare==0.7.5 # via ipython -pillow==9.5.0 +pillow==10.0.0 # via -r base.txt -pip-tools==6.13.0 +pip-tools==7.3.0 # via -r base.txt -platformdirs==3.2.0 +platformdirs==3.10.0 # via # black # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via pytest -pre-commit==3.2.2 +pre-commit==3.3.3 # via -r local.in -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r base.txt # click-repl # ipython -psycopg[binary]==3.1.8 +psycopg[binary]==3.1.10 # via -r local.in -psycopg-binary==3.1.8 +psycopg-binary==3.1.10 # via psycopg ptyprocess==0.7.0 # via pexpect pure-eval==0.2.2 # via stack-data -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via flake8 pycparser==2.21 # via # -r base.txt # cffi -pyflakes==3.0.1 +pyflakes==3.1.0 # via flake8 -pygments==2.15.0 +pygments==2.16.1 # via ipython -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # -r base.txt # django-allauth -pylint==2.17.2 +pylint==2.17.5 # via # pylint-django # pylint-plugin-utils pylint-django==2.5.3 # via -r local.in -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via pylint-django -pyproj==3.5.0 +pyproj==3.6.0 # via -r base.txt pyproject-hooks==1.0.0 # via # -r base.txt # build -pytest==7.3.0 +pytest==7.4.0 # via # -r local.in # pytest-django @@ -327,10 +321,13 @@ pytest-django==4.5.2 pytest-sugar==0.9.7 # via -r local.in python-dateutil==2.8.2 - # via faker + # via + # -r base.txt + # celery + # faker python-slugify==8.0.1 # via -r base.txt -python-stdnum==1.18 +python-stdnum==1.19 # via # -r base.txt # django-localflavor @@ -339,10 +336,8 @@ python3-openid==3.2.0 # -r base.txt # django-allauth pytz==2023.3 - # via - # -r base.txt - # celery -pyyaml==6.0 + # via -r base.txt +pyyaml==6.0.1 # via # djlint # pre-commit @@ -350,13 +345,13 @@ rcssmin==1.1.1 # via # -r base.txt # django-compressor -redis==4.5.4 +redis==5.0.0 # via # -r base.txt # django-redis -regex==2023.5.5 +regex==2023.8.8 # via djlint -requests==2.28.2 +requests==2.31.0 # via # -r base.txt # django-allauth @@ -374,55 +369,45 @@ shapely==2.0.1 six==1.16.0 # via # -r base.txt - # click-repl # cssbeautifier # jsbeautifier # python-dateutil -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r base.txt # django # django-debug-toolbar stack-data==0.6.2 # via ipython -termcolor==2.2.0 +termcolor==2.3.0 # via pytest-sugar text-unidecode==1.3 # via # -r base.txt # python-slugify -tomli==2.0.1 - # via - # -r base.txt - # black - # build - # django-stubs - # djlint - # ipdb - # mypy - # pylint - # pyproject-hooks - # pytest -tomlkit==0.11.7 +tomlkit==0.12.1 # via pylint -tqdm==4.65.0 +tqdm==4.66.1 # via djlint traitlets==5.9.0 # via # ipython # matplotlib-inline -types-pytz==2023.3.0.0 +types-pytz==2023.3.0.1 # via django-stubs -types-pyyaml==6.0.12.9 +types-pyyaml==6.0.12.11 # via django-stubs -typing-extensions==4.5.0 +typing-extensions==4.7.1 # via - # astroid # django-stubs # django-stubs-ext # mypy # psycopg -urllib3==1.26.15 +tzdata==2023.3 + # via + # -r base.txt + # celery +urllib3==1.26.16 # via # -r base.txt # requests @@ -432,7 +417,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.21.0 +virtualenv==20.24.3 # via pre-commit watchdog==2.2.1 # via -r local.in @@ -440,13 +425,13 @@ wcwidth==0.2.6 # via # -r base.txt # prompt-toolkit -werkzeug==2.2.3 +werkzeug==2.3.7 # via -r local.in -wheel==0.40.0 +wheel==0.41.1 # via # -r base.txt # pip-tools -whitenoise==6.4.0 +whitenoise==6.5.0 # via -r base.txt wrapt==1.15.0 # via astroid diff --git a/requirements/production.txt b/requirements/production.txt index 40b16d7e1..2d8dc2807 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile production.in @@ -8,27 +8,23 @@ amqp==5.1.1 # via # -r base.txt # kombu -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 # via -r base.txt argon2-cffi-bindings==21.2.0 # via # -r base.txt # argon2-cffi -asgiref==3.6.0 +asgiref==3.7.2 # via # -r base.txt # django -async-timeout==4.0.2 - # via - # -r base.txt - # redis -billiard==3.6.4.0 +billiard==4.1.0 # via # -r base.txt # celery -boto3==1.26.112 +boto3==1.28.30 # via django-storages -botocore==1.29.112 +botocore==1.31.30 # via # boto3 # s3transfer @@ -36,9 +32,9 @@ build==0.10.0 # via # -r base.txt # pip-tools -celery==5.2.7 +celery==5.3.1 # via -r base.txt -certifi==2022.12.7 +certifi==2023.7.22 # via # -r base.txt # pyproj @@ -49,11 +45,11 @@ cffi==1.15.1 # -r base.txt # argon2-cffi-bindings # cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r base.txt # requests -click==8.1.3 +click==8.1.7 # via # -r base.txt # celery @@ -69,13 +65,14 @@ click-plugins==1.1.1 # via # -r base.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r base.txt # celery -cryptography==40.0.1 +cryptography==41.0.3 # via # -r base.txt + # django-anymail # pyjwt defusedxml==0.7.1 # via @@ -97,7 +94,7 @@ django==4.2 # django-storages django-allauth==0.54.0 # via -r base.txt -django-anymail[sendinblue]==9.1 +django-anymail[sendinblue]==10.1 # via -r production.in django-appconf==1.0.5 # via @@ -105,29 +102,29 @@ django-appconf==1.0.5 # django-compressor django-braces==1.15.0 # via -r base.txt -django-compressor==4.3.1 +django-compressor==4.4 # via -r base.txt django-crispy-forms==2.0 # via -r base.txt django-environ==0.10.0 # via -r base.txt -django-leaflet==0.28.3 +django-leaflet==0.29.0 # via -r base.txt -django-localflavor==3.1 +django-localflavor==4.0 # via -r base.txt django-model-utils==4.3.1 # via -r base.txt -django-phonenumber-field[phonenumbers]==7.0.2 +django-phonenumber-field[phonenumbers]==7.1.0 # via -r base.txt -django-ratelimit==4.0.0 +django-ratelimit==4.1.0 # via -r base.txt -django-redis==5.2.0 +django-redis==5.3.0 # via -r base.txt django-storages[boto3]==1.13.2 # via -r production.in -gunicorn==20.1.0 +gunicorn==21.2.0 # via -r production.in -hiredis==2.2.2 +hiredis==2.2.3 # via -r base.txt idna==3.4 # via @@ -137,13 +134,13 @@ jmespath==1.0.1 # via # boto3 # botocore -kombu==5.2.4 +kombu==5.3.1 # via # -r base.txt # celery -markdown==3.4.3 +markdown==3.4.4 # via -r base.txt -numpy==1.24.2 +numpy==1.25.2 # via # -r base.txt # shapely @@ -155,41 +152,45 @@ packaging==23.1 # via # -r base.txt # build -phonenumbers==8.13.9 + # gunicorn +phonenumbers==8.13.18 # via # -r base.txt # django-phonenumber-field -pillow==9.5.0 +pillow==10.0.0 # via -r base.txt -pip-tools==6.13.0 +pip-tools==7.3.0 # via -r base.txt -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r base.txt # click-repl -psycopg[binary]==3.1.8 +psycopg[binary]==3.1.10 # via -r production.in -psycopg-binary==3.1.8 +psycopg-binary==3.1.10 # via psycopg pycparser==2.21 # via # -r base.txt # cffi -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # -r base.txt # django-allauth -pyproj==3.5.0 +pyproj==3.6.0 # via -r base.txt pyproject-hooks==1.0.0 # via # -r base.txt # build python-dateutil==2.8.2 - # via botocore + # via + # -r base.txt + # botocore + # celery python-slugify==8.0.1 # via -r base.txt -python-stdnum==1.18 +python-stdnum==1.19 # via # -r base.txt # django-localflavor @@ -198,18 +199,16 @@ python3-openid==3.2.0 # -r base.txt # django-allauth pytz==2023.3 - # via - # -r base.txt - # celery + # via -r base.txt rcssmin==1.1.1 # via # -r base.txt # django-compressor -redis==4.5.4 +redis==5.0.0 # via # -r base.txt # django-redis -requests==2.28.2 +requests==2.31.0 # via # -r base.txt # django-allauth @@ -223,18 +222,17 @@ rjsmin==1.2.1 # via # -r base.txt # django-compressor -s3transfer==0.6.0 +s3transfer==0.6.2 # via boto3 -sentry-sdk==1.19.1 +sentry-sdk==1.29.2 # via -r production.in shapely==2.0.1 # via -r base.txt six==1.16.0 # via # -r base.txt - # click-repl # python-dateutil -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r base.txt # django @@ -242,17 +240,17 @@ text-unidecode==1.3 # via # -r base.txt # python-slugify -tomli==2.0.1 +typing-extensions==4.7.1 + # via psycopg +tzdata==2023.3 # via # -r base.txt - # build - # pyproject-hooks -typing-extensions==4.5.0 - # via psycopg -urllib3==1.26.15 + # celery +urllib3==1.26.16 # via # -r base.txt # botocore + # django-anymail # requests # sentry-sdk vine==5.0.0 @@ -265,11 +263,11 @@ wcwidth==0.2.6 # via # -r base.txt # prompt-toolkit -wheel==0.40.0 +wheel==0.41.1 # via # -r base.txt # pip-tools -whitenoise==6.4.0 +whitenoise==6.5.0 # via -r base.txt # The following packages are considered to be unsafe in a requirements file: From e06d4b78d7891f5e1d49ceac0979c3782ca7c4c2 Mon Sep 17 00:00:00 2001 From: Thibault Jouannic Date: Mon, 21 Aug 2023 11:02:00 +0200 Subject: [PATCH 2/2] Remove the watchdog version pin --- requirements/local.in | 2 +- requirements/local.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements/local.in b/requirements/local.in index 977b5c1d1..379454407 100644 --- a/requirements/local.in +++ b/requirements/local.in @@ -30,4 +30,4 @@ django-debug-toolbar django-extensions django-coverage-plugin pytest-django -watchdog<2.3 +watchdog diff --git a/requirements/local.txt b/requirements/local.txt index 6a5bcff74..151ab14d8 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -369,6 +369,7 @@ shapely==2.0.1 six==1.16.0 # via # -r base.txt + # asttokens # cssbeautifier # jsbeautifier # python-dateutil @@ -419,7 +420,7 @@ vine==5.0.0 # kombu virtualenv==20.24.3 # via pre-commit -watchdog==2.2.1 +watchdog==3.0.0 # via -r local.in wcwidth==0.2.6 # via