From cbb6ede316b5a3e6f83a8a03f97468295719cf07 Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 2 Feb 2024 12:05:52 +0000 Subject: [PATCH 1/7] Bump django to 4.2.8 and update deps --- requirements.in | 89 ++++++++++---------- requirements.txt | 151 +++++++++++++++++---------------- requirements_test.txt | 192 ++++++++++++++++++++++-------------------- 3 files changed, 226 insertions(+), 206 deletions(-) diff --git a/requirements.in b/requirements.in index 960577f4..41c428a7 100644 --- a/requirements.in +++ b/requirements.in @@ -1,54 +1,57 @@ -django==4.2 -dj-database-url==0.5.0 -django-environ==0.4.5 -django-extensions==3.2.1 +django==4.2.8 +django-celery-beat==2.5.0 +django-cleanup==8.1.0 +django-cte==1.3.2 +django-environ==0.11.2 +django-extensions==3.2.3 django-field-history==0.8.0 -djangorestframework==3.14.* -django_storages[boto3]==1.13.2 +django-filter==23.5 django-flat-json-widget==0.2 -django-filter==22.* -django-import-export==3.2.0 -kombu<6.0,>=5.2.3 -django-celery-beat==2.5.0 -django-redis==5.2.* -django-cleanup==5.2.0 -whitenoise==6.4.0 -psycopg2-binary==2.9.* -sentry-sdk==1.29.2 -boto3==1.24.* -celery[redis]>=5.2.2 -requests[security]==2.31.0 -elasticsearch==7.* -elasticsearch-dsl>=7.0.0,<8.0.0 -waitress==2.1.2 -sigauth==5.2.0 +django-health-check==3.17.0 +django-import-export==3.3.6 +django-json-widget==1.1.1 +django-redis==5.4.0 django-staff-sso-client==4.2.1 -directory-validators==9.3.2 -directory-constants==24.0.0 +django-storages==1.13.2 +django-timezone-field==6.1.0 +djangorestframework==3.14.0 +directory-client-core==7.2.11 +directory-components==40.2.0 +directory-constants==24.1.0 +directory-forms-api-client==7.3.2 +directory-healthcheck==3.3 directory-sso-api-client==7.2.6 -directory-healthcheck==3.2 -directory-forms-api-client>=7.3.2 +directory-validators==9.3.2 +notifications-python-client==9.0.0 +boto3==1.24.* +celery[redis]>=5.2.2 +certifi==2023.07.22 cryptography==41.0.6 -directory-components==40.1.0 -urllib3==1.26.18 +deprecated==1.2.* +dj-database-url +drf-spectacular==0.26.1 +elasticsearch-dsl>=7.0.0,<8.0.0 +elasticsearch==7.* factory-boy==2.12.0 -markdown2==2.4.0 iso3166==1.0.1 -django_json_widget==1.0.1 -deprecated==1.2.* -pyyaml==6.0 -urllib3>=1.26.5 -xmltodict==0.12.0 -notifications-python-client==6.3.0 -xhtml2pdf==0.2.11 -pyjwt==2.4.0 -pandas==1.4.2 -sqlalchemy==1.4.36 -django-cte==1.2.0 +kombu<6.0,>=5.2.3 lxml==4.9.1 +markdown2==2.4.0 oauthlib==3.2.2 +pandas==1.4.2 pillow==10.0.1 -sqlparse==0.4.4 -drf-spectacular==0.26.1 -certifi==2023.07.22 +psycopg2-binary==2.9.* +pyjwt==2.4.0 pypdf==3.17.0 +pyyaml==6.0 +requests[security]==2.31.0 +sentry-sdk==1.29.2 +sigauth==5.2.5 +sqlalchemy==1.4.36 +sqlparse==0.4.4 +urllib3==1.26.18 +urllib3>=1.26.5 +waitress==2.1.2 +whitenoise==6.4.0 +xhtml2pdf==0.2.11 +xmltodict==0.12.0 diff --git a/requirements.txt b/requirements.txt index 71bd8894..34d5ab07 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile requirements.in # -amqp==5.1.1 +amqp==5.2.0 # via kombu arabic-reshaper==3.0.0 # via xhtml2pdf @@ -15,25 +15,24 @@ asn1crypto==1.5.1 # oscrypto # pyhanko # pyhanko-certvalidator -async-timeout==4.0.2 +async-timeout==4.0.3 # via redis -attrs==22.1.0 +attrs==23.2.0 # via jsonschema -beautifulsoup4==4.11.1 +beautifulsoup4==4.12.3 # via directory-components -billiard==3.6.4.0 +billiard==4.2.0 # via celery boto3==1.24.96 - # via - # -r requirements.in - # django-storages + # via -r requirements.in botocore==1.27.96 # via # boto3 # s3transfer -celery[redis]==5.2.7 +celery[redis]==5.3.6 # via # -r requirements.in + # celery # django-celery-beat certifi==2023.7.22 # via @@ -41,11 +40,11 @@ certifi==2023.7.22 # elasticsearch # requests # sentry-sdk -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==2.1.1 +charset-normalizer==3.3.2 # via requests -click==8.1.3 +click==8.1.7 # via # celery # click-didyoumean @@ -56,9 +55,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 -cron-descriptor==1.4.0 +cron-descriptor==1.4.3 # via django-celery-beat cryptography==41.0.6 # via @@ -69,31 +68,32 @@ cssselect2==0.7.0 # via svglib defusedxml==0.7.1 # via odfpy -deprecated==1.2.13 +deprecated==1.2.14 # via -r requirements.in -diff-match-patch==20200713 +diff-match-patch==20230430 # via django-import-export -directory-client-core==7.2.8 +directory-client-core==7.2.11 # via + # -r requirements.in # directory-forms-api-client # directory-sso-api-client -directory-components==40.1.0 +directory-components==40.2.0 # via -r requirements.in -directory-constants==24.0.0 +directory-constants==24.1.0 # via # -r requirements.in # directory-components directory-forms-api-client==7.3.2 # via -r requirements.in -directory-healthcheck==3.2 +directory-healthcheck==3.3 # via -r requirements.in directory-sso-api-client==7.2.6 # via -r requirements.in directory-validators==9.3.2 # via -r requirements.in -dj-database-url==0.5.0 +dj-database-url==2.1.0 # via -r requirements.in -django==4.2 +django==4.2.8 # via # -r requirements.in # directory-client-core @@ -101,6 +101,7 @@ django==4.2 # directory-constants # directory-healthcheck # directory-validators + # dj-database-url # django-celery-beat # django-extensions # django-filter @@ -109,39 +110,44 @@ django==4.2 # django-redis # django-staff-sso-client # django-storages + # django-timezone-field # djangorestframework # drf-spectacular # sigauth django-celery-beat==2.5.0 # via -r requirements.in -django-cleanup==5.2.0 +django-cleanup==8.1.0 # via -r requirements.in -django-cte==1.2.0 +django-cte==1.3.2 # via -r requirements.in -django-environ==0.4.5 +django-environ==0.11.2 # via -r requirements.in -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements.in django-field-history==0.8.0 # via -r requirements.in -django-filter==22.1 +django-filter==23.5 # via -r requirements.in django-flat-json-widget==0.2 # via -r requirements.in django-health-check==3.17.0 - # via directory-healthcheck -django-import-export==3.2.0 + # via + # -r requirements.in + # directory-healthcheck +django-import-export==3.3.6 # via -r requirements.in -django-json-widget==1.0.1 +django-json-widget==1.1.1 # via -r requirements.in -django-redis==5.2.0 +django-redis==5.4.0 # via -r requirements.in django-staff-sso-client==4.2.1 # via -r requirements.in -django-storages[boto3]==1.13.2 +django-storages==1.13.2 # via -r requirements.in -django-timezone-field==5.0 - # via django-celery-beat +django-timezone-field==6.1.0 + # via + # -r requirements.in + # django-celery-beat djangorestframework==3.14.0 # via # -r requirements.in @@ -151,7 +157,7 @@ docopt==0.6.2 # via notifications-python-client drf-spectacular==0.26.1 # via -r requirements.in -elasticsearch==7.13.4 +elasticsearch==7.17.9 # via # -r requirements.in # elasticsearch-dsl @@ -161,13 +167,13 @@ et-xmlfile==1.1.0 # via openpyxl factory-boy==2.12.0 # via -r requirements.in -faker==15.3.4 +faker==22.6.0 # via factory-boy future==0.18.3 # via django-json-widget html5lib==1.1 # via xhtml2pdf -idna==3.4 +idna==3.6 # via requests inflection==0.5.1 # via drf-spectacular @@ -181,7 +187,7 @@ jsonschema==3.2.0 # via # directory-components # drf-spectacular -kombu==5.2.4 +kombu==5.3.5 # via # -r requirements.in # celery @@ -197,9 +203,9 @@ mohawk==1.1.0 # via sigauth monotonic==1.6 # via directory-client-core -notifications-python-client==6.3.0 +notifications-python-client==9.0.0 # via -r requirements.in -numpy==1.24.0 +numpy==1.26.3 # via pandas oauthlib==3.2.2 # via @@ -207,9 +213,9 @@ oauthlib==3.2.2 # requests-oauthlib odfpy==1.4.1 # via tablib -olefile==0.46 +olefile==0.47 # via directory-validators -openpyxl==3.0.10 +openpyxl==3.1.2 # via tablib oscrypto==1.3.0 # via pyhanko-certvalidator @@ -221,15 +227,15 @@ pillow==10.0.1 # directory-validators # reportlab # xhtml2pdf -prompt-toolkit==3.0.36 +prompt-toolkit==3.0.43 # via click-repl -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.9 # via -r requirements.in pycparser==2.21 # via cffi -pyhanko==0.15.1 +pyhanko==0.21.0 # via xhtml2pdf -pyhanko-certvalidator==0.19.7 +pyhanko-certvalidator==0.26.3 # via # pyhanko # xhtml2pdf @@ -241,38 +247,36 @@ pypdf==3.17.0 # via # -r requirements.in # xhtml2pdf -pyrsistent==0.19.2 +pypng==0.20220715.0 + # via qrcode +pyrsistent==0.20.0 # via jsonschema python-bidi==0.4.2 # via xhtml2pdf -python-crontab==2.6.0 +python-crontab==3.0.0 # via django-celery-beat python-dateutil==2.8.2 # via # botocore + # celery # elasticsearch-dsl # faker # pandas # python-crontab -pytz==2021.3 +pytz==2023.3 # via - # celery # directory-validators - # django-timezone-field # djangorestframework # pandas - # pyhanko -pytz-deprecation-shim==0.1.0.post0 - # via tzlocal pyyaml==6.0 # via # -r requirements.in # drf-spectacular # pyhanko # tablib -qrcode==7.3.1 +qrcode==7.4.2 # via pyhanko -redis==4.4.4 +redis==5.0.1 # via # celery # django-redis @@ -287,20 +291,20 @@ requests[security]==2.31.0 # notifications-python-client # pyhanko # pyhanko-certvalidator + # requests # requests-oauthlib requests-oauthlib==1.3.1 # via django-staff-sso-client -s3transfer==0.6.0 +s3transfer==0.6.2 # via boto3 sentry-sdk==1.29.2 # via -r requirements.in -sigauth==5.2.0 +sigauth==5.2.5 # via # -r requirements.in # directory-client-core six==1.16.0 # via - # click-repl # elasticsearch-dsl # html5lib # jsonschema @@ -308,7 +312,7 @@ six==1.16.0 # python-bidi # python-dateutil # w3lib -soupsieve==2.3.2.post1 +soupsieve==2.5 # via beautifulsoup4 sqlalchemy==1.4.36 # via -r requirements.in @@ -316,27 +320,32 @@ sqlparse==0.4.4 # via # -r requirements.in # django -svglib==1.4.1 +svglib==1.5.1 # via xhtml2pdf -tablib[html,ods,xls,xlsx,yaml]==3.4.0 - # via django-import-export +tablib[html,ods,xls,xlsx,yaml]==3.5.0 + # via + # django-import-export + # tablib tinycss2==1.2.1 # via # cssselect2 # svglib -typing-extensions==4.7.1 +typing-extensions==4.9.0 # via # asgiref + # dj-database-url + # kombu # pypdf -tzdata==2022.7 + # qrcode +tzdata==2023.4 # via + # celery # django-celery-beat - # pytz-deprecation-shim -tzlocal==4.2 +tzlocal==5.2 # via pyhanko uritemplate==4.1.1 # via drf-spectacular -uritools==4.0.0 +uritools==4.0.2 # via pyhanko-certvalidator urllib3==1.26.18 # via @@ -346,7 +355,7 @@ urllib3==1.26.18 # elasticsearch # requests # sentry-sdk -vine==5.0.0 +vine==5.1.0 # via # amqp # celery @@ -355,7 +364,7 @@ w3lib==1.22.0 # via directory-client-core waitress==2.1.2 # via -r requirements.in -wcwidth==0.2.5 +wcwidth==0.2.13 # via prompt-toolkit webencodings==0.5.1 # via @@ -364,7 +373,7 @@ webencodings==0.5.1 # tinycss2 whitenoise==6.4.0 # via -r requirements.in -wrapt==1.14.1 +wrapt==1.16.0 # via deprecated xhtml2pdf==0.2.11 # via -r requirements.in diff --git a/requirements_test.txt b/requirements_test.txt index 4600c2c8..6f877672 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -4,7 +4,7 @@ # # pip-compile requirements_test.in # -amqp==5.0.9 +amqp==5.2.0 # via kombu arabic-reshaper==3.0.0 # via xhtml2pdf @@ -15,15 +15,15 @@ asn1crypto==1.5.1 # oscrypto # pyhanko # pyhanko-certvalidator -async-timeout==4.0.2 +async-timeout==4.0.3 # via redis -attrs==21.4.0 +attrs==23.2.0 # via # jsonschema # pytest -beautifulsoup4==4.10.0 +beautifulsoup4==4.12.3 # via directory-components -billiard==3.6.4.0 +billiard==4.2.0 # via celery black==23.1.0 # via @@ -32,16 +32,15 @@ black==23.1.0 blacken-docs==1.13.0 # via -r requirements_test.in boto3==1.24.96 - # via - # -r requirements.in - # django-storages + # via -r requirements.in botocore==1.27.96 # via # boto3 # s3transfer -celery[redis]==5.2.3 +celery[redis]==5.3.6 # via # -r requirements.in + # celery # django-celery-beat certifi==2023.7.22 # via @@ -49,11 +48,11 @@ certifi==2023.7.22 # elasticsearch # requests # sentry-sdk -cffi==1.15.0 +cffi==1.16.0 # via cryptography -charset-normalizer==3.0.1 +charset-normalizer==3.3.2 # via requests -click==8.0.3 +click==8.1.7 # via # black # celery @@ -65,50 +64,52 @@ 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 -coverage[toml]==6.3 +coverage[toml]==7.4.1 # via + # coverage # pytest-codecov # pytest-cov -cron-descriptor==1.4.0 +cron-descriptor==1.4.3 # via django-celery-beat cryptography==41.0.6 # via # -r requirements.in # pyhanko # pyhanko-certvalidator -cssselect2==0.5.0 +cssselect2==0.7.0 # via svglib dataclasses==0.6 # via -r requirements_test.in defusedxml==0.7.1 # via odfpy -deprecated==1.2.13 +deprecated==1.2.14 # via -r requirements.in -diff-match-patch==20200713 +diff-match-patch==20230430 # via django-import-export -directory-client-core==7.2.8 +directory-client-core==7.2.11 # via + # -r requirements.in # directory-forms-api-client # directory-sso-api-client -directory-components==40.1.0 +directory-components==40.2.0 # via -r requirements.in -directory-constants==24.0.0 +directory-constants==24.1.0 # via # -r requirements.in # directory-components directory-forms-api-client==7.3.2 # via -r requirements.in -directory-healthcheck==3.2 +directory-healthcheck==3.3 # via -r requirements.in directory-sso-api-client==7.2.6 # via -r requirements.in directory-validators==9.3.2 # via -r requirements.in -dj-database-url==0.5.0 +dj-database-url==2.1.0 # via -r requirements.in -django==4.2 +django==4.2.8 # via # -r requirements.in # directory-client-core @@ -116,6 +117,7 @@ django==4.2 # directory-constants # directory-healthcheck # directory-validators + # dj-database-url # django-celery-beat # django-extensions # django-filter @@ -124,39 +126,44 @@ django==4.2 # django-redis # django-staff-sso-client # django-storages + # django-timezone-field # djangorestframework # drf-spectacular # sigauth django-celery-beat==2.5.0 # via -r requirements.in -django-cleanup==5.2.0 +django-cleanup==8.1.0 # via -r requirements.in -django-cte==1.2.0 +django-cte==1.3.2 # via -r requirements.in -django-environ==0.4.5 +django-environ==0.11.2 # via -r requirements.in -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements.in django-field-history==0.8.0 # via -r requirements.in -django-filter==22.1 +django-filter==23.5 # via -r requirements.in django-flat-json-widget==0.2 # via -r requirements.in django-health-check==3.17.0 - # via directory-healthcheck -django-import-export==3.2.0 + # via + # -r requirements.in + # directory-healthcheck +django-import-export==3.3.6 # via -r requirements.in -django-json-widget==1.0.1 +django-json-widget==1.1.1 # via -r requirements.in -django-redis==5.2.0 +django-redis==5.4.0 # via -r requirements.in django-staff-sso-client==4.2.1 # via -r requirements.in -django-storages[boto3]==1.13.2 +django-storages==1.13.2 # via -r requirements.in -django-timezone-field==5.0 - # via django-celery-beat +django-timezone-field==6.1.0 + # via + # -r requirements.in + # django-celery-beat djangorestframework==3.14.0 # via # -r requirements.in @@ -166,7 +173,7 @@ docopt==0.6.2 # via notifications-python-client drf-spectacular==0.26.1 # via -r requirements.in -elasticsearch==7.13.4 +elasticsearch==7.17.9 # via # -r requirements.in # elasticsearch-dsl @@ -176,7 +183,7 @@ et-xmlfile==1.1.0 # via openpyxl factory-boy==2.12.0 # via -r requirements.in -faker==11.3.0 +faker==22.6.0 # via factory-boy flake8==3.8.4 # via -r requirements_test.in @@ -184,23 +191,23 @@ freezegun==0.3.12 # via -r requirements_test.in future==0.18.3 # via django-json-widget -gitdb==4.0.10 +gitdb==4.0.11 # via gitpython gitpython==3.1.41 # via -r requirements_test.in html5lib==1.1 # via xhtml2pdf -idna==2.10 +idna==3.6 # via requests inflection==0.5.1 # via drf-spectacular -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest iso3166==1.0.1 # via -r requirements.in isort==5.12.0 # via -r requirements_test.in -jmespath==0.10.0 +jmespath==1.0.1 # via # boto3 # botocore @@ -208,7 +215,7 @@ jsonschema==3.2.0 # via # directory-components # drf-spectacular -kombu==5.2.3 +kombu==5.3.5 # via # -r requirements.in # celery @@ -222,15 +229,15 @@ markuppy==1.14 # via tablib mccabe==0.6.1 # via flake8 -mohawk==0.3.4 +mohawk==1.1.0 # via sigauth monotonic==1.6 # via directory-client-core -mypy-extensions==0.4.3 +mypy-extensions==1.0.0 # via black -notifications-python-client==6.3.0 +notifications-python-client==9.0.0 # via -r requirements.in -numpy==1.22.3 +numpy==1.26.3 # via pandas oauthlib==3.2.2 # via @@ -238,20 +245,20 @@ oauthlib==3.2.2 # requests-oauthlib odfpy==1.4.1 # via tablib -olefile==0.46 +olefile==0.47 # via directory-validators -openpyxl==3.0.9 +openpyxl==3.1.2 # via tablib oscrypto==1.3.0 # via pyhanko-certvalidator -packaging==23.0 +packaging==23.2 # via # black # pytest # pytest-sugar pandas==1.4.2 # via -r requirements.in -pathspec==0.9.0 +pathspec==0.12.1 # via black pillow==10.0.1 # via @@ -259,15 +266,15 @@ pillow==10.0.1 # directory-validators # reportlab # xhtml2pdf -platformdirs==2.4.1 +platformdirs==4.2.0 # via black -pluggy==0.13.1 +pluggy==1.4.0 # via pytest pre-commit-hooks==3.3.0 # via -r requirements_test.in -prompt-toolkit==3.0.26 +prompt-toolkit==3.0.43 # via click-repl -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.9 # via -r requirements.in py==1.11.0 # via pytest @@ -277,9 +284,9 @@ pycparser==2.21 # via cffi pyflakes==2.2.0 # via flake8 -pyhanko==0.13.2 +pyhanko==0.21.0 # via xhtml2pdf -pyhanko-certvalidator==0.19.5 +pyhanko-certvalidator==0.26.3 # via # pyhanko # xhtml2pdf @@ -291,7 +298,9 @@ pypdf==3.17.0 # via # -r requirements.in # xhtml2pdf -pyrsistent==0.18.1 +pypng==0.20220715.0 + # via qrcode +pyrsistent==0.20.0 # via jsonschema pytest==7.1.3 # via @@ -302,7 +311,7 @@ pytest==7.1.3 # pytest-sugar pytest-codecov==0.5.1 # via -r requirements_test.in -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via # -r requirements_test.in # pytest-codecov @@ -312,35 +321,31 @@ pytest-sugar==0.9.2 # via -r requirements_test.in python-bidi==0.4.2 # via xhtml2pdf -python-crontab==2.6.0 +python-crontab==3.0.0 # via django-celery-beat python-dateutil==2.8.2 # via # botocore + # celery # elasticsearch-dsl # faker # freezegun # pandas # python-crontab -pytz==2021.3 +pytz==2023.3 # via - # celery # directory-validators - # django-timezone-field # djangorestframework # pandas - # pyhanko -pytz-deprecation-shim==0.1.0.post0 - # via tzlocal pyyaml==6.0 # via # -r requirements.in # drf-spectacular # pyhanko # tablib -qrcode==7.3.1 +qrcode==7.4.2 # via pyhanko -redis==4.4.4 +redis==5.0.1 # via # celery # django-redis @@ -356,27 +361,27 @@ requests[security]==2.31.0 # pyhanko # pyhanko-certvalidator # pytest-codecov + # requests # requests-mock # requests-oauthlib requests-mock==1.6.0 # via -r requirements_test.in -requests-oauthlib==1.3.0 +requests-oauthlib==1.3.1 # via django-staff-sso-client -ruamel-yaml==0.17.21 +ruamel-yaml==0.18.5 # via pre-commit-hooks -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via ruamel-yaml -s3transfer==0.6.0 +s3transfer==0.6.2 # via boto3 sentry-sdk==1.29.2 # via -r requirements.in -sigauth==5.2.0 +sigauth==5.2.5 # via # -r requirements.in # directory-client-core six==1.16.0 # via - # click-repl # elasticsearch-dsl # freezegun # html5lib @@ -386,9 +391,9 @@ six==1.16.0 # python-dateutil # requests-mock # w3lib -smmap==5.0.0 +smmap==5.0.1 # via gitdb -soupsieve==2.3.1 +soupsieve==2.5 # via beautifulsoup4 sqlalchemy==1.4.36 # via -r requirements.in @@ -396,39 +401,42 @@ sqlparse==0.4.4 # via # -r requirements.in # django -svglib==1.2.1 +svglib==1.5.1 # via xhtml2pdf -tablib[html,ods,xls,xlsx,yaml]==3.4.0 - # via django-import-export -termcolor==1.1.0 +tablib[html,ods,xls,xlsx,yaml]==3.5.0 + # via + # django-import-export + # tablib +termcolor==2.4.0 # via pytest-sugar -text-unidecode==1.3 - # via faker -tinycss2==1.1.1 +tinycss2==1.2.1 # via # cssselect2 # svglib toml==0.10.2 # via pre-commit-hooks -tomli==1.2.3 +tomli==2.0.1 # via # black # coverage # pytest -typing-extensions==4.0.1 +typing-extensions==4.9.0 # via # asgiref # black + # dj-database-url + # kombu # pypdf -tzdata==2022.1 + # qrcode +tzdata==2023.4 # via + # celery # django-celery-beat - # pytz-deprecation-shim -tzlocal==4.2 +tzlocal==5.2 # via pyhanko uritemplate==4.1.1 # via drf-spectacular -uritools==4.0.0 +uritools==4.0.2 # via pyhanko-certvalidator urllib3==1.26.18 # via @@ -438,7 +446,7 @@ urllib3==1.26.18 # elasticsearch # requests # sentry-sdk -vine==5.0.0 +vine==5.1.0 # via # amqp # celery @@ -447,7 +455,7 @@ w3lib==1.22.0 # via directory-client-core waitress==2.1.2 # via -r requirements.in -wcwidth==0.2.5 +wcwidth==0.2.13 # via prompt-toolkit webencodings==0.5.1 # via @@ -456,7 +464,7 @@ webencodings==0.5.1 # tinycss2 whitenoise==6.4.0 # via -r requirements.in -wrapt==1.13.3 +wrapt==1.16.0 # via deprecated xhtml2pdf==0.2.11 # via -r requirements.in From 1f8c894fde1c572f08b5611ae7950ac27008bb3c Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 2 Feb 2024 12:13:39 +0000 Subject: [PATCH 2/7] updated black --- .../management/commands/update_investment_services_directory.py | 1 + requirements_test.in | 2 +- requirements_test.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/company/management/commands/update_investment_services_directory.py b/company/management/commands/update_investment_services_directory.py index e34d84bc..a0a27c99 100644 --- a/company/management/commands/update_investment_services_directory.py +++ b/company/management/commands/update_investment_services_directory.py @@ -1,6 +1,7 @@ """ Management utility to update Investment Services Directory. """ + import ast import csv from datetime import datetime diff --git a/requirements_test.in b/requirements_test.in index 5c347ee3..352145aa 100644 --- a/requirements_test.in +++ b/requirements_test.in @@ -10,7 +10,7 @@ pytest-codecov GitPython==3.1.41 # Pinned because pre-commit features specific versions -black==23.1.0 +black==24.1.1 # Pinned pin dataclasses as 0.08 specified by black doesn't exist dataclasses==0.06 blacken-docs==1.13.0 diff --git a/requirements_test.txt b/requirements_test.txt index 6f877672..dbfaef8a 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -25,7 +25,7 @@ beautifulsoup4==4.12.3 # via directory-components billiard==4.2.0 # via celery -black==23.1.0 +black==24.1.1 # via # -r requirements_test.in # blacken-docs From 09e99aaf4cbea8a248d653e4850fed7f25df8583 Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 2 Feb 2024 12:22:20 +0000 Subject: [PATCH 3/7] fix elasticsearch test errors --- requirements.in | 2 +- requirements.txt | 2 +- requirements_test.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 41c428a7..b64d0a7d 100644 --- a/requirements.in +++ b/requirements.in @@ -31,7 +31,7 @@ deprecated==1.2.* dj-database-url drf-spectacular==0.26.1 elasticsearch-dsl>=7.0.0,<8.0.0 -elasticsearch==7.* +elasticsearch<7.14.0 factory-boy==2.12.0 iso3166==1.0.1 kombu<6.0,>=5.2.3 diff --git a/requirements.txt b/requirements.txt index 34d5ab07..03e249fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -157,7 +157,7 @@ docopt==0.6.2 # via notifications-python-client drf-spectacular==0.26.1 # via -r requirements.in -elasticsearch==7.17.9 +elasticsearch==7.13.4 # via # -r requirements.in # elasticsearch-dsl diff --git a/requirements_test.txt b/requirements_test.txt index dbfaef8a..d3ee81dd 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -173,7 +173,7 @@ docopt==0.6.2 # via notifications-python-client drf-spectacular==0.26.1 # via -r requirements.in -elasticsearch==7.17.9 +elasticsearch==7.13.4 # via # -r requirements.in # elasticsearch-dsl From 0d4492b755193fd38883799b5cde3093b3052c60 Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 2 Feb 2024 12:40:10 +0000 Subject: [PATCH 4/7] fix test --- dataservices/tests/factories.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dataservices/tests/factories.py b/dataservices/tests/factories.py index 6889c293..b5ac85b0 100644 --- a/dataservices/tests/factories.py +++ b/dataservices/tests/factories.py @@ -52,6 +52,7 @@ class CountryFactory(factory.django.DjangoModelFactory): class Meta: model = models.Country + django_get_or_create = ('name', 'iso1', 'iso2', 'iso3') class UKTradeInGoodsByCountryFactory(factory.django.DjangoModelFactory): From ed8ac6d735131189c8fe31248dfd5709417584cd Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 2 Feb 2024 14:03:38 +0000 Subject: [PATCH 5/7] Fix activitystream test --- activitystream/tests/test_views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activitystream/tests/test_views.py b/activitystream/tests/test_views.py index c1c2d756..b2d411d3 100644 --- a/activitystream/tests/test_views.py +++ b/activitystream/tests/test_views.py @@ -108,7 +108,8 @@ def test_empty_object_returned_with_authentication(api_client, activities_url): content=response.content, content_type=response['Content-Type'], ) - with pytest.raises(mohawk.exc.MacMismatch): + + with pytest.raises(mohawk.exc.BadHeaderValue): sender.accept_response( response_header=response['Server-Authorization'] + 'incorrect', content=response.content, From 5479c22b3affa259197b7083857211c03b9c1808 Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 2 Feb 2024 14:09:53 +0000 Subject: [PATCH 6/7] black and flake8 --- activitystream/tests/test_views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/activitystream/tests/test_views.py b/activitystream/tests/test_views.py index b2d411d3..d72dde00 100644 --- a/activitystream/tests/test_views.py +++ b/activitystream/tests/test_views.py @@ -108,7 +108,6 @@ def test_empty_object_returned_with_authentication(api_client, activities_url): content=response.content, content_type=response['Content-Type'], ) - with pytest.raises(mohawk.exc.BadHeaderValue): sender.accept_response( response_header=response['Server-Authorization'] + 'incorrect', From 10ad86f89c8f17d71696eb197eda0f0ba1afacfc Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 2 Feb 2024 14:23:17 +0000 Subject: [PATCH 7/7] bump pillow to 10.2.0 --- requirements.in | 2 +- requirements.txt | 2 +- requirements_test.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index b64d0a7d..71cbc97f 100644 --- a/requirements.in +++ b/requirements.in @@ -39,7 +39,7 @@ lxml==4.9.1 markdown2==2.4.0 oauthlib==3.2.2 pandas==1.4.2 -pillow==10.0.1 +pillow==10.2.0 psycopg2-binary==2.9.* pyjwt==2.4.0 pypdf==3.17.0 diff --git a/requirements.txt b/requirements.txt index 03e249fd..f094bf11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -221,7 +221,7 @@ oscrypto==1.3.0 # via pyhanko-certvalidator pandas==1.4.2 # via -r requirements.in -pillow==10.0.1 +pillow==10.2.0 # via # -r requirements.in # directory-validators diff --git a/requirements_test.txt b/requirements_test.txt index d3ee81dd..6aa5f9dc 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -260,7 +260,7 @@ pandas==1.4.2 # via -r requirements.in pathspec==0.12.1 # via black -pillow==10.0.1 +pillow==10.2.0 # via # -r requirements.in # directory-validators