From f090050c515db7f5c59b7d253ddb47929801efce Mon Sep 17 00:00:00 2001 From: ezkat <50319957+ezkat@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:06:43 +0200 Subject: [PATCH 1/3] Update requirements --- linkedevents/settings.py | 2 +- requirements.in | 1 + requirements.txt | 207 +++++++++++++++++++++------------------ 3 files changed, 111 insertions(+), 99 deletions(-) diff --git a/linkedevents/settings.py b/linkedevents/settings.py index cfcc29be7..6f379e85f 100644 --- a/linkedevents/settings.py +++ b/linkedevents/settings.py @@ -484,7 +484,7 @@ def dummy_haystack_connection_for_lang(language_code): import bleach # noqa -BLEACH_ALLOWED_TAGS = bleach.ALLOWED_TAGS + ["p", "div", "br"] +BLEACH_ALLOWED_TAGS = frozenset().union(*[bleach.ALLOWED_TAGS, frozenset(["p", "div", "br"])]) from easy_thumbnails.conf import Settings as thumbnail_settings # noqa THUMBNAIL_PROCESSORS = ( diff --git a/requirements.in b/requirements.in index f6104e57b..18d778b30 100644 --- a/requirements.in +++ b/requirements.in @@ -49,3 +49,4 @@ requests-cache requests sentry-sdk six +urllib3<2 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8a44870e5..23eaa7174 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,44 +1,45 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile +# pip-compile --output-file=requirements.txt requirements.in # --no-binary psycopg2 -aiohttp==3.7.4.post0 +aiohttp==3.9.3 # via -r requirements.in -asgiref==3.6.0 - # via django -async-timeout==3.0.1 +aiosignal==1.3.1 # via aiohttp -attrs==21.2.0 +asgiref==3.7.2 + # via django +async-timeout==4.0.3 # via aiohttp -bleach==3.3.0 +attrs==23.2.0 + # via + # aiohttp + # cattrs + # requests-cache +bleach==6.1.0 # via -r requirements.in -cachetools==5.2.1 +cachetools==5.3.2 # via django-helusers -certifi==2022.12.7 +cattrs==23.2.3 + # via requests-cache +certifi==2023.11.17 # via + # elastic-transport # requests # sentry-sdk -cffi==1.14.0 +cffi==1.16.0 # via cryptography -chardet==3.0.4 - # via - # aiohttp - # requests -coreapi==2.3.3 - # via drf-yasg -coreschema==0.0.4 - # via - # coreapi - # drf-yasg -cryptography==3.3.2 +charset-normalizer==3.3.2 + # via requests +cryptography==42.0.2 # via + # django-anymail # pyjwt # social-auth-core -defusedxml==0.6.0 +defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core @@ -52,13 +53,14 @@ django==3.2.18 # django-anymail # django-appconf # django-cors-headers + # django-extensions # django-filter # django-haystack # django-helusers # django-jinja + # django-js-asset # django-leaflet # django-modeltranslation - # django-mptt # django-munigeo-turku # django-parler # django-parler-rest @@ -68,39 +70,39 @@ django==3.2.18 # drf-oidc-auth # drf-yasg # easy-thumbnails -django-admin-autocomplete-filter==0.4 +django-admin-autocomplete-filter==0.7.1 # via -r requirements.in django-allauth==0.52.0 # via -r requirements.in -django-anymail==7.0.0 +django-anymail==10.2 # via -r requirements.in -django-appconf==1.0.4 +django-appconf==1.0.6 # via django-image-cropping -django-cleanup==4.0.0 +django-cleanup==8.1.0 # via -r requirements.in django-cors-headers==3.13.0 # via -r requirements.in -django-environ==0.4.5 +django-environ==0.11.2 # via -r requirements.in -django-extensions==2.2.9 +django-extensions==3.2.3 # via -r requirements.in -django-filter==2.4.0 +django-filter==23.5 # via -r requirements.in django-haystack==3.1.0 # via -r requirements.in django-helusers==0.7.1 # via -r requirements.in -django-image-cropping==1.3.0 +django-image-cropping==1.7 # via -r requirements.in django-jinja==2.10.2 # via -r requirements.in -django-js-asset==1.2.2 +django-js-asset==2.2.0 # via django-mptt -django-leaflet==0.26.0 +django-leaflet==0.29.0 # via -r requirements.in -django-modeltranslation==0.18.7 +django-modeltranslation==0.18.11 # via -r requirements.in -django-mptt==0.11.0 +django-mptt==0.16.0 # via # -r requirements.in # django-munigeo-turku @@ -117,7 +119,7 @@ django-parler-rest==2.2 # via django-munigeo-turku django-reversion==5.0.4 # via -r requirements.in -djangorestframework==3.13.1 +djangorestframework==3.14.0 # via # -r requirements.in # django-orghierarchy-turku @@ -128,83 +130,91 @@ djangorestframework==3.13.1 # drf-yasg djangorestframework-bulk==0.2.1 # via -r requirements.in -djangorestframework-gis==0.15 +djangorestframework-gis==1.0 # via -r requirements.in djangorestframework-jwt==1.11.0 # via -r requirements.in drf-oidc-auth==0.9 # via -r requirements.in -drf-yasg==1.21.3 +drf-yasg==1.21.7 # via -r requirements.in -easy-thumbnails==2.7 +easy-thumbnails==2.8.5 # via -r requirements.in -ecdsa==0.15 +ecdsa==0.18.0 # via python-jose -elasticsearch==7.6.0 +elastic-transport==8.12.0 + # via elasticsearch +elasticsearch==8.12.0 # via -r requirements.in +exceptiongroup==1.2.0 + # via cattrs +frozenlist==1.4.1 + # via + # aiohttp + # aiosignal future==0.18.3 # via pyjwkest geographiclib==1.52 # via geopy geopy==2.2.0 # via -r requirements.in -httmock==1.3.0 +httmock==1.4.0 # via -r requirements.in -icalendar==4.0.5 +icalendar==5.0.11 # via -r requirements.in -idna==2.9 +idna==3.6 # via # requests # yarl +importlib-metadata==7.0.1 + # via markdown inflection==0.5.1 # via drf-yasg -isodate==0.6.0 +isodate==0.6.1 # via # -r requirements.in # rdflib -itypes==1.2.0 - # via coreapi -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements.in - # coreschema # django-jinja -langdetect==1.0.8 +langdetect==1.0.9 # via -r requirements.in lxml==4.9.1 # via # -r requirements.in # python-docx -markdown==3.2.1 +markdown==3.5.2 # via -r requirements.in -markupsafe==2.1.1 +markupsafe==2.1.4 # via jinja2 -multidict==5.1.0 +multidict==6.0.4 # via # aiohttp # yarl -oauthlib==3.1.0 +oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -packaging==21.3 +packaging==23.2 # via - # bleach # deprecation # drf-yasg -pillow==8.2.0 +pillow==10.2.0 # via # -r requirements.in # easy-thumbnails -psycopg2==2.8.4 +platformdirs==4.2.0 + # via requests-cache +psycopg2==2.9.9 # via -r requirements.in -pyasn1==0.4.8 +pyasn1==0.5.1 # via # python-jose # rsa -pycparser==2.20 +pycparser==2.21 # via cffi -pycryptodomex==3.9.7 +pycryptodomex==3.20.0 # via pyjwkest pyjwkest==1.4.2 # via drf-oidc-auth @@ -212,42 +222,41 @@ pyjwt[crypto]==1.7.1 # via # django-allauth # djangorestframework-jwt + # pyjwt # social-auth-core -pyparsing==2.4.6 - # via - # packaging - # rdflib -python-dateutil==2.8.1 +pyparsing==3.1.1 + # via rdflib +python-dateutil==2.8.2 # via # -r requirements.in # icalendar -python-docx==0.8.10 +python-docx==1.1.0 # via -r requirements.in -python-jose==3.1.0 +python-jose==3.3.0 # via django-helusers python-social-auth==0.3.6 # via -r requirements.in -python3-openid==3.1.0 +python3-openid==3.2.0 # via # django-allauth # social-auth-core -pytz==2022.2.1 +pytz==2023.4 # via # -r requirements.in # django # djangorestframework # drf-yasg # icalendar -pyyaml==5.4 +pyyaml==6.0.1 # via # -r requirements.in # django-munigeo-turku -rdflib==4.2.2 + # drf-yasg +rdflib==7.0.0 # via -r requirements.in -requests==2.23.0 +requests==2.31.0 # via # -r requirements.in - # coreapi # django-allauth # django-anymail # django-helusers @@ -258,63 +267,65 @@ requests==2.23.0 # requests-cache # requests-oauthlib # social-auth-core -requests-cache==0.6.0.dev1 +requests-cache==1.1.1 # via # -r requirements.in # django-munigeo-turku -requests-oauthlib==1.3.0 +requests-oauthlib==1.3.1 # via # django-allauth # social-auth-core -rsa==4.7 +rsa==4.9 # via python-jose -ruamel-yaml==0.17.21 - # via drf-yasg -sentry-sdk==0.14.3 +sentry-sdk==1.40.0 # via -r requirements.in -six==1.14.0 +six==1.16.0 # via # -r requirements.in # bleach - # cryptography - # django-anymail - # django-extensions # django-munigeo-turku # ecdsa # isodate # langdetect # pyjwkest # python-dateutil - # python-jose # social-auth-app-django # social-auth-core -social-auth-app-django==3.1.0 + # url-normalize +social-auth-app-django==4.0.0 # via -r requirements.in -social-auth-core==3.3.2 +social-auth-core==4.0.2 # via # python-social-auth # social-auth-app-django -sqlparse==0.3.1 +sqlparse==0.4.4 # via django swapper==1.3.0 # via django-orghierarchy-turku -typing-extensions==3.10.0.0 +typing-extensions==4.9.0 # via - # aiohttp + # asgiref + # cattrs # django-modeltranslation + # python-docx uritemplate==4.1.1 + # via drf-yasg +url-normalize==1.4.3 + # via requests-cache +urllib3==1.26.18 # via - # coreapi - # drf-yasg -urllib3==1.25.9 - # via - # elasticsearch + # -r requirements.in + # django-anymail + # elastic-transport # requests + # requests-cache # sentry-sdk webencodings==0.5.1 # via bleach -yarl==1.6.3 +yarl==1.9.4 # via aiohttp +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools From ad45963e41e29268b917f1bf3400ea7d9bee3cd4 Mon Sep 17 00:00:00 2001 From: ezkat <50319957+ezkat@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:08:39 +0200 Subject: [PATCH 2/3] drop python 3.7, 3.8 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f25312e27..7c7394eaf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: - 5432:5432 strategy: matrix: - python-version: ["3.7", "3.8", "3.9"] + python-version: ["3.9"] steps: - uses: actions/checkout@v2 - name: Setup Python From ae7df460a5841b748a4b9ec72b1ab038979d4dd5 Mon Sep 17 00:00:00 2001 From: ezkat <50319957+ezkat@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:13:54 +0200 Subject: [PATCH 3/3] Update requirements-dev --- requirements-dev.txt | 114 +++++++++++++++++++++++++++++++++---------- 1 file changed, 87 insertions(+), 27 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index f1b1f8cb1..7785b9c7a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,36 +1,96 @@ # -# This file is autogenerated by pip-compile -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # # pip-compile --output-file=requirements-dev.txt requirements-dev.in # --no-binary psycopg2 -astroid==2.5.0 # via pylint -atomicwrites==1.3.0 # via pytest -attrs==19.3.0 # via pytest -click==7.0 # via pip-tools -django-extensions==2.2.6 -entrypoints==0.3 # via flake8 -flake8==3.7.9 # via -r requirements-dev.in -freezegun==0.3.15 -importlib-metadata==1.6.0 # via pluggy -isort==4.3.21 # via pylint -lazy-object-proxy==1.4.3 # via astroid -mccabe==0.6.1 # via flake8, pylint -more-itertools==8.2.0 # via pytest -pip-tools==4.4.1 # via -r requirements-dev.in -pluggy==0.13.1 # via pytest -py==1.10.0 # via pytest -pycodestyle==2.5.0 # via flake8 -pyflakes==2.1.1 # via -r requirements-dev.in, flake8 -pylint==2.7.0 # via -r requirements-dev.in -pytest-django==3.8.0 # via -r requirements-dev.in -pytest==5.3.5 # via -r requirements-dev.in, pytest-django -six==1.14.0 # via -c requirements.txt, astroid, pip-tools, pytest -typed-ast==1.4.1 # via astroid -wrapt==1.11.1 # via astroid -zipp==3.1.0 # via importlib-metadata +astroid==3.0.2 + # via pylint +build==1.0.3 + # via pip-tools +click==8.1.7 + # via pip-tools +dill==0.3.8 + # via pylint +exceptiongroup==1.2.0 + # via + # -c requirements.txt + # pytest +flake8==7.0.0 + # via -r requirements-dev.in +freezegun==1.4.0 + # via -r requirements-dev.in +importlib-metadata==7.0.1 + # via + # -c requirements.txt + # build +iniconfig==2.0.0 + # via pytest +isort==5.13.2 + # via pylint +mccabe==0.7.0 + # via + # flake8 + # pylint +packaging==23.2 + # via + # -c requirements.txt + # build + # pytest +pip-tools==7.3.0 + # via -r requirements-dev.in +platformdirs==4.2.0 + # via + # -c requirements.txt + # pylint +pluggy==1.4.0 + # via pytest +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.2.0 + # via + # -r requirements-dev.in + # flake8 +pylint==3.0.3 + # via -r requirements-dev.in +pyproject-hooks==1.0.0 + # via build +pytest==8.0.0 + # via + # -r requirements-dev.in + # pytest-django +pytest-django==4.8.0 + # via -r requirements-dev.in +python-dateutil==2.8.2 + # via + # -c requirements.txt + # freezegun +six==1.16.0 + # via + # -c requirements.txt + # python-dateutil +tomli==2.0.1 + # via + # build + # pip-tools + # pylint + # pyproject-hooks + # pytest +tomlkit==0.12.3 + # via pylint +typing-extensions==4.9.0 + # via + # -c requirements.txt + # astroid + # pylint +wheel==0.42.0 + # via pip-tools +zipp==3.17.0 + # via + # -c requirements.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools