From bd7c0d6c845e82d05844478f078ef1ca348dbd69 Mon Sep 17 00:00:00 2001 From: Crocmagnon Date: Mon, 26 Jun 2023 18:05:05 +0000 Subject: [PATCH 1/2] Update dependencies --- constraints.txt | 18 +++++++++--------- requirements-dev.txt | 26 +++++++++++++------------- requirements.txt | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/constraints.txt b/constraints.txt index 24f6be9..523fb7c 100644 --- a/constraints.txt +++ b/constraints.txt @@ -12,7 +12,7 @@ cffi==1.15.1 # via cryptography charset-normalizer==3.1.0 # via requests -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib crispy-bootstrap5==0.7 # via -r requirements.in @@ -32,7 +32,7 @@ django==4.2.2 # django-solo django-anymail==10.0 # via -r requirements.in -django-cleanup==7.0.0 +django-cleanup==8.0.0 # via -r requirements.in django-crispy-forms==2.0 # via @@ -44,11 +44,11 @@ django-environ==0.10.0 # via -r requirements.in django-extensions==3.2.3 # via -r requirements.in -django-htmx==1.14.0 +django-htmx==1.15.0 # via -r requirements.in django-solo==2.1.0 # via -r requirements.in -fonttools==4.39.4 +fonttools==4.40.0 # via matplotlib freezegun==1.2.2 # via -r requirements.in @@ -60,7 +60,7 @@ kiwisolver==1.4.4 # via matplotlib matplotlib==3.7.1 # via -r requirements.in -numpy==1.24.3 +numpy==1.25.0 # via # contourpy # matplotlib @@ -72,7 +72,7 @@ pillow==9.5.0 # matplotlib pycparser==2.21 # via cffi -pyparsing==3.0.9 +pyparsing==3.1.0 # via matplotlib python-dateutil==2.8.2 # via @@ -86,13 +86,13 @@ six==1.16.0 # via python-dateutil sqlparse==0.4.4 # via django -urllib3==2.0.2 +urllib3==2.0.3 # via # django-anymail # requests -whitenoise==6.4.0 +whitenoise==6.5.0 # via -r requirements.in # The following packages are considered to be unsafe in a requirements file: -setuptools==67.8.0 +setuptools==68.0.0 # via gunicorn diff --git a/requirements-dev.txt b/requirements-dev.txt index b0390d4..4528b2f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -45,9 +45,9 @@ exceptiongroup==1.1.1 # via trio-websocket factory-boy==3.2.1 # via -r requirements-dev.in -faker==18.10.1 +faker==18.11.1 # via factory-boy -filelock==3.12.0 +filelock==3.12.2 # via virtualenv h11==0.14.0 # via wsproto @@ -60,7 +60,7 @@ idna==3.4 # trio iniconfig==2.0.0 # via pytest -invoke==2.1.2 +invoke==2.1.3 # via -r requirements-dev.in model-bakery==1.12.0 # via -r requirements-dev.in @@ -80,13 +80,13 @@ pathspec==0.11.1 # via black pip-tools==6.13.0 # via -r requirements-dev.in -platformdirs==3.5.1 +platformdirs==3.8.0 # via # black # virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via pytest -pre-commit==3.3.2 +pre-commit==3.3.3 # via -r requirements-dev.in py==1.11.0 # via pytest-html @@ -94,7 +94,7 @@ pyproject-hooks==1.0.0 # via build pysocks==1.7.1 # via urllib3 -pytest==7.3.1 +pytest==7.4.0 # via # -r requirements-dev.in # pytest-base-url @@ -129,9 +129,9 @@ requests==2.31.0 # -c constraints.txt # pytest-base-url # pytest-selenium -ruff==0.0.270 +ruff==0.0.275 # via -r requirements-dev.in -selenium==4.9.1 +selenium==4.10.0 # via # -r requirements-dev.in # pytest-selenium @@ -153,14 +153,14 @@ trio==0.22.0 # via # selenium # trio-websocket -trio-websocket==0.10.2 +trio-websocket==0.10.3 # via selenium -urllib3[socks]==2.0.2 +urllib3[socks]==2.0.3 # via # -c constraints.txt # requests # selenium -virtualenv==20.23.0 +virtualenv==20.23.1 # via pre-commit wheel==0.40.0 # via pip-tools @@ -170,7 +170,7 @@ wsproto==1.2.0 # The following packages are considered to be unsafe in a requirements file: pip==23.1.2 # via pip-tools -setuptools==67.8.0 +setuptools==68.0.0 # via # -c constraints.txt # nodeenv diff --git a/requirements.txt b/requirements.txt index 5282fd5..903fe97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ cffi==1.15.1 # via cryptography charset-normalizer==3.1.0 # via requests -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib crispy-bootstrap5==0.7 # via -r requirements.in @@ -32,7 +32,7 @@ django==4.2.2 # django-solo django-anymail[mailgun]==10.0 # via -r requirements.in -django-cleanup==7.0.0 +django-cleanup==8.0.0 # via -r requirements.in django-crispy-forms==2.0 # via @@ -44,11 +44,11 @@ django-environ==0.10.0 # via -r requirements.in django-extensions==3.2.3 # via -r requirements.in -django-htmx==1.14.0 +django-htmx==1.15.0 # via -r requirements.in django-solo==2.1.0 # via -r requirements.in -fonttools==4.39.4 +fonttools==4.40.0 # via matplotlib freezegun==1.2.2 # via -r requirements.in @@ -60,7 +60,7 @@ kiwisolver==1.4.4 # via matplotlib matplotlib==3.7.1 # via -r requirements.in -numpy==1.24.3 +numpy==1.25.0 # via # contourpy # matplotlib @@ -72,7 +72,7 @@ pillow==9.5.0 # matplotlib pycparser==2.21 # via cffi -pyparsing==3.0.9 +pyparsing==3.1.0 # via matplotlib python-dateutil==2.8.2 # via @@ -86,13 +86,13 @@ six==1.16.0 # via python-dateutil sqlparse==0.4.4 # via django -urllib3==2.0.2 +urllib3==2.0.3 # via # django-anymail # requests -whitenoise==6.4.0 +whitenoise==6.5.0 # via -r requirements.in # The following packages are considered to be unsafe in a requirements file: -setuptools==67.8.0 +setuptools==68.0.0 # via gunicorn From 8257e1b9f10716d1fcadca2e070ffeb4ce3013f8 Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Tue, 27 Jun 2023 19:27:18 +0200 Subject: [PATCH 2/2] pin selenium to prevent pytest-selenium breaking --- constraints.txt | 6 ------ requirements-dev.in | 5 ++++- requirements-dev.txt | 2 +- requirements.txt | 6 ------ 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/constraints.txt b/constraints.txt index 523fb7c..eabaa62 100644 --- a/constraints.txt +++ b/constraints.txt @@ -8,16 +8,12 @@ asgiref==3.7.2 # via django certifi==2023.5.7 # via requests -cffi==1.15.1 - # via cryptography charset-normalizer==3.1.0 # via requests contourpy==1.1.0 # via matplotlib crispy-bootstrap5==0.7 # via -r requirements.in -cryptography==41.0.1 - # via django-anymail cycler==0.11.0 # via matplotlib django==4.2.2 @@ -70,8 +66,6 @@ pillow==9.5.0 # via # -r requirements.in # matplotlib -pycparser==2.21 - # via cffi pyparsing==3.1.0 # via matplotlib python-dateutil==2.8.2 diff --git a/requirements-dev.in b/requirements-dev.in index f92d149..dfbeee5 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -8,7 +8,10 @@ pre-commit>=2.7 model-bakery>=1.1 invoke>=2.0.0 factory-boy>=3.2.1 -selenium>=4.4.3 +# pytest-selenium is broken with selenium 4.10.0 +# TypeError: WebDriver.__init__() got an unexpected keyword argument 'service_log_path' +# https://github.com/robotframework/SeleniumLibrary/issues/1835 +selenium>=4.4.3,<4.10.0 black>=22.12.0 pip-tools>=6.0 ruff>=0.0.237 diff --git a/requirements-dev.txt b/requirements-dev.txt index 4528b2f..953ec94 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -131,7 +131,7 @@ requests==2.31.0 # pytest-selenium ruff==0.0.275 # via -r requirements-dev.in -selenium==4.10.0 +selenium==4.9.1 # via # -r requirements-dev.in # pytest-selenium diff --git a/requirements.txt b/requirements.txt index 903fe97..18915f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,16 +8,12 @@ asgiref==3.7.2 # via django certifi==2023.5.7 # via requests -cffi==1.15.1 - # via cryptography charset-normalizer==3.1.0 # via requests contourpy==1.1.0 # via matplotlib crispy-bootstrap5==0.7 # via -r requirements.in -cryptography==41.0.1 - # via django-anymail cycler==0.11.0 # via matplotlib django==4.2.2 @@ -70,8 +66,6 @@ pillow==9.5.0 # via # -r requirements.in # matplotlib -pycparser==2.21 - # via cffi pyparsing==3.1.0 # via matplotlib python-dateutil==2.8.2