diff --git a/.circleci/config.yml b/.circleci/config.yml index e71d274b11..6fbeadee0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ version: 2 jobs: python: docker: - - image: udata/circleci:2-alpine + - image: udata/circleci:py3.11 - image: mongo:6.0.4 - image: redis:alpine environment: @@ -24,11 +24,10 @@ jobs: - py3-cache-v12-{{ arch }}-{{ .Environment.BASE_BRANCH }} - run: name: Install python dependencies - # FIXME: For now, we fix setuptools due to https://github.com/etalab/data.gouv.fr/issues/1041 command: | - virtualenv venv + python -m venv venv source venv/bin/activate - pip install --force-reinstall setuptools==66.1.1 + pip install --upgrade wheel pip install -r requirements/develop.pip pip install -e . - save_cache: @@ -59,7 +58,7 @@ jobs: assets: docker: # TODO make an image based on 2-alpine w/ nvm and phantom deps - - image: udata/circleci:py3 + - image: udata/circleci:py3.11 environment: BASH_ENV: /root/.bashrc steps: @@ -103,7 +102,7 @@ jobs: dist: docker: - - image: udata/circleci:2-alpine + - image: udata/circleci:py3.11 environment: BASH_ENV: /root/.bashrc steps: @@ -134,7 +133,7 @@ jobs: publish: docker: - - image: udata/circleci:2-alpine + - image: udata/circleci:py3.11 steps: - attach_workspace: at: . diff --git a/CHANGELOG.md b/CHANGELOG.md index 544e1b5a4d..bb47353996 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Current (in progress) +- **breaking change** Migrate to Python 3.11 [#2992](https://github.com/opendatateam/udata/pull/2992) - **breaking change** Fix datetime serialization in extras (return ISO string in JSON). Warning, `ujson` shouldn't be installed anymore on the project to allow `cls` parameter to override the JSONEncoder [#3019](https://github.com/opendatateam/udata/pull/3019) - Fix missing `bcrypt` dependency [#3019](https://github.com/opendatateam/udata/pull/3019) diff --git a/requirements/all.pip b/requirements/all.pip deleted file mode 100644 index 31f60969bd..0000000000 --- a/requirements/all.pip +++ /dev/null @@ -1,4 +0,0 @@ --r install.pip --r test.pip --r report.pip --r develop.pip diff --git a/requirements/develop.in b/requirements/develop.in index c3e7e90276..1b5ea7e302 100644 --- a/requirements/develop.in +++ b/requirements/develop.in @@ -1,9 +1,10 @@ -r test.in -c test.pip -invoke==1.7.3 +invoke==2.2.0 wheel # Pinned Twine's version. The newest one pulls a version of the cryptography pkg that's make the CircleCi build fail. twine==3.3.0 pre-commit==2.14.0 pip-tools==6.13.0 +flask-shell-ipython==0.5.1 diff --git a/requirements/develop.pip b/requirements/develop.pip index 1f530752ea..a7e0098e2b 100644 --- a/requirements/develop.pip +++ b/requirements/develop.pip @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.7 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --output-file=requirements/develop.pip requirements/develop.in # -amqp==2.6.1 +amqp==5.2.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -19,7 +19,9 @@ appdirs==1.4.4 # -c requirements/install.pip # -c requirements/test.pip # urlextract -attrs==21.2.0 +asttokens==2.4.1 + # via stack-data +attrs==23.2.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -40,24 +42,20 @@ babel==2.12.1 # -c requirements/test.pip # -r requirements/install.in # flask-babel -backports-entry-points-selectable==1.2.0 - # via virtualenv bcrypt==3.1.7 # via - # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -billiard==3.6.4.0 +billiard==4.2.0 # via # -c requirements/install.pip # -c requirements/test.pip # celery -bleach==3.1.0 +bleach==3.3.1 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in - # readme-renderer blinker==1.4 # via # -c requirements/install.pip @@ -74,20 +72,20 @@ boto3==1.26.102 # -c requirements/test.pip # -r requirements/install.in # flask-storage -botocore==1.29.104 +botocore==1.29.165 # via # -c requirements/install.pip # -c requirements/test.pip # boto3 # s3transfer -build==0.8.0 +build==1.1.1 # via pip-tools cachelib==0.9.0 # via # -c requirements/install.pip # -c requirements/test.pip # flask-caching -celery==4.3.0 +celery==5.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -98,32 +96,52 @@ celerybeat-mongo==0.2.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -certifi==2021.5.30 +certifi==2024.2.2 # via # -c requirements/install.pip # -c requirements/test.pip # requests -cffi==1.14.6 +cffi==1.16.0 # via # -c requirements/install.pip # -c requirements/test.pip # bcrypt # cryptography -cfgv==3.3.0 +cfgv==3.4.0 # via pre-commit chardet==3.0.4 # via # -c requirements/install.pip # -c requirements/test.pip # requests -click==8.0.0 +click==8.1.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in + # celery + # click-didyoumean + # click-plugins + # click-repl # flask + # flask-shell-ipython # geomet # pip-tools +click-didyoumean==0.3.0 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery +click-plugins==1.1.1 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery +click-repl==0.3.0 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery colorama==0.4.6 # via twine cryptography==2.8 @@ -133,26 +151,26 @@ cryptography==2.8 # -r requirements/install.in # authlib # secretstorage -distlib==0.3.6 +decorator==5.1.1 + # via ipython +distlib==0.3.8 # via virtualenv -dnspython==2.1.0 +dnspython==2.6.1 # via # -c requirements/install.pip # -c requirements/test.pip # email-validator # pymongo -docutils==0.17.1 +docutils==0.20.1 # via readme-renderer -email-validator==1.1.3 +email-validator==2.1.1 # via # -c requirements/install.pip # -c requirements/test.pip # flask-security-too # wtforms -exceptiongroup==1.1.0 - # via - # -c requirements/test.pip - # pytest +executing==2.0.1 + # via stack-data factory-boy==2.12.0 # via # -c requirements/install.pip @@ -164,7 +182,7 @@ faker==3.0.0 # -c requirements/test.pip # -r requirements/install.in # factory-boy -filelock==3.12.0 +filelock==3.13.1 # via virtualenv flask==2.1.2 # via @@ -183,11 +201,12 @@ flask==2.1.2 # flask-principal # flask-restx # flask-security-too + # flask-shell-ipython # flask-sitemap # flask-storage # flask-wtf # pytest-flask -flask-babel==3.1.0 +flask-babel==4.0.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -229,7 +248,7 @@ flask-mongoengine==1.0.0 # -c requirements/test.pip # -r requirements/install.in # flask-storage -flask-navigation==0.2.0 +flask-navigation @ git+https://github.com/krs-novice/flask-navigation-ks.git@develop # via # -c requirements/install.pip # -c requirements/test.pip @@ -249,7 +268,9 @@ flask-security-too==5.1.2 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -flask-sitemap==0.3.0 +flask-shell-ipython==0.5.1 + # via -r requirements/develop.in +flask-sitemap==0.4.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -285,7 +306,7 @@ httpretty==1.1.4 # via # -c requirements/test.pip # -r requirements/test.in -identify==2.2.13 +identify==2.5.35 # via pre-commit idna==2.10 # via @@ -294,28 +315,17 @@ idna==2.10 # email-validator # requests # urlextract -importlib-metadata==6.0.0 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # backports-entry-points-selectable - # build - # flask - # jsonschema - # keyring - # pep517 - # pluggy - # pre-commit - # pytest - # twine - # virtualenv +importlib-metadata==7.0.2 + # via keyring iniconfig==2.0.0 # via # -c requirements/test.pip # pytest -invoke==1.7.3 +invoke==2.2.0 # via -r requirements/develop.in -isodate==0.6.0 +ipython==8.22.2 + # via flask-shell-ipython +isodate==0.6.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -327,6 +337,10 @@ itsdangerous==2.1.2 # flask # flask-security-too # flask-wtf +jaraco-classes==3.3.1 + # via keyring +jedi==0.19.1 + # via ipython jeepney==0.8.0 # via # keyring @@ -349,9 +363,9 @@ jsonschema==3.2.0 # -c requirements/install.pip # -c requirements/test.pip # flask-restx -keyring==23.0.1 +keyring==24.3.1 # via twine -kombu[redis]==4.4.0 +kombu[redis]==5.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -362,7 +376,7 @@ langdetect==1.0.9 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -lxml==4.4.2 +lxml==4.9.3 # via # -c requirements/install.pip # -c requirements/test.pip @@ -375,6 +389,8 @@ markupsafe==2.1.2 # jinja2 # werkzeug # wtforms +matplotlib-inline==0.1.6 + # via ipython mistune==0.8.4 # via # -c requirements/install.pip @@ -391,26 +407,34 @@ mongoengine==0.27.0 # -r requirements/install.in # celerybeat-mongo # flask-mongoengine +more-itertools==10.2.0 + # via jaraco-classes netaddr==0.7.19 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -nodeenv==1.6.0 +nh3==0.2.15 + # via readme-renderer +nodeenv==1.8.0 # via pre-commit -packaging==23.1 +packaging==24.0 # via + # -c requirements/install.pip # -c requirements/test.pip + # bleach # build # pytest # pytest-sugar +parso==0.8.3 + # via jedi passlib==1.7.4 # via # -c requirements/install.pip # -c requirements/test.pip # flask-security-too -pep517==0.11.0 - # via build +pexpect==4.9.0 + # via ipython pillow==9.2.0 # via # -c requirements/install.pip @@ -419,17 +443,27 @@ pillow==9.2.0 # pydenticon pip-tools==6.13.0 # via -r requirements/develop.in -pkginfo==1.7.1 +pkginfo==1.10.0 # via twine -platformdirs==2.6.2 +platformdirs==4.2.0 # via virtualenv -pluggy==0.13.1 +pluggy==1.4.0 # via # -c requirements/test.pip # pytest pre-commit==2.14.0 # via -r requirements/develop.in -pycparser==2.20 +prompt-toolkit==3.0.43 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # click-repl + # ipython +ptyprocess==0.7.0 + # via pexpect +pure-eval==0.2.2 + # via stack-data +pycparser==2.21 # via # -c requirements/install.pip # -c requirements/test.pip @@ -439,8 +473,10 @@ pydenticon==0.3.1 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -pygments==2.9.0 - # via readme-renderer +pygments==2.17.2 + # via + # ipython + # readme-renderer pymongo==4.3.3 # via # -c requirements/install.pip @@ -448,12 +484,14 @@ pymongo==4.3.3 # -r requirements/install.in # celerybeat-mongo # mongoengine -pyparsing==2.4.7 +pyparsing==3.1.2 # via # -c requirements/install.pip # -c requirements/test.pip # rdflib -pyrsistent==0.18.0 +pyproject-hooks==1.0.0 + # via build +pyrsistent==0.20.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -482,20 +520,19 @@ pytest-sugar==0.9.7 # via # -c requirements/test.pip # -r requirements/test.in -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in # botocore + # celery # faker -pytz==2022.7 +pytz==2024.1 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in - # babel - # celery # flask-babel # flask-restx pyyaml==6.0.1 @@ -505,15 +542,15 @@ rdflib==6.0.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -readme-renderer==29.0 +readme-renderer==43.0 # via twine -redis==3.3.11 +redis==4.5.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in # kombu -regex==2021.8.3 +regex==2023.12.25 # via # -c requirements/install.pip # -c requirements/test.pip @@ -530,11 +567,11 @@ requests-mock==1.10.0 # via # -c requirements/test.pip # -r requirements/test.in -requests-toolbelt==0.9.1 +requests-toolbelt==1.0.0 # via twine -rfc3986==1.5.0 +rfc3986==2.0.0 # via twine -s3transfer==0.6.0 +s3transfer==0.6.2 # via # -c requirements/install.pip # -c requirements/test.pip @@ -545,6 +582,7 @@ six==1.16.0 # via # -c requirements/install.pip # -c requirements/test.pip + # asttokens # bcrypt # bleach # cryptography @@ -554,21 +592,21 @@ six==1.16.0 # jsonschema # langdetect # python-dateutil - # readme-renderer # requests-mock - # virtualenv # wtforms-json speaklater==1.3 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in +stack-data==0.6.3 + # via ipython stringdist==1.0.9 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -termcolor==2.2.0 +termcolor==2.4.0 # via # -c requirements/test.pip # pytest-sugar @@ -577,34 +615,32 @@ text-unidecode==1.3 # -c requirements/install.pip # -c requirements/test.pip # faker -tlds==2021080800 +tlds==2024030600 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in toml==0.10.2 # via pre-commit -tomli==2.0.1 - # via - # -c requirements/test.pip - # build - # pep517 - # pytest -tqdm==4.62.0 +tqdm==4.66.2 # via twine +traitlets==5.14.2 + # via + # ipython + # matplotlib-inline twine==3.3.0 # via -r requirements/develop.in -typing-extensions==4.7.1 +tzdata==2024.1 # via + # -c requirements/install.pip # -c requirements/test.pip - # importlib-metadata - # platformdirs + # celery unidecode==0.4.21 # via # -c requirements/install.pip # -c requirements/test.pip # awesome-slugify -uritools==3.0.2 +uritools==4.0.2 # via # -c requirements/install.pip # -c requirements/test.pip @@ -620,19 +656,25 @@ urllib3==1.25.11 # -c requirements/test.pip # botocore # requests -vine==1.3.0 +vine==5.1.0 # via # -c requirements/install.pip # -c requirements/test.pip # amqp # celery -virtualenv==20.7.1 + # kombu +virtualenv==20.25.1 # via pre-commit voluptuous==0.11.7 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in +wcwidth==0.2.13 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # prompt-toolkit webencodings==0.5.1 # via # -c requirements/install.pip @@ -647,7 +689,7 @@ werkzeug==2.2.2 # flask-login # flask-restx # pytest-flask -wheel==0.36.2 +wheel==0.43.0 # via # -r requirements/develop.in # pip-tools @@ -665,12 +707,8 @@ wtforms-json==0.3.5 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -zipp==3.12.1 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # importlib-metadata - # pep517 +zipp==3.18.1 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.pip b/requirements/doc.pip index 726f66883e..e88f5aa11d 100644 --- a/requirements/doc.pip +++ b/requirements/doc.pip @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.7 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --output-file=requirements/doc.pip requirements/doc.in # -amqp==2.6.1 +amqp==5.2.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -19,7 +19,7 @@ appdirs==1.4.4 # -c requirements/install.pip # -c requirements/test.pip # urlextract -attrs==21.2.0 +attrs==23.2.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -41,16 +41,13 @@ babel==2.12.1 # -r requirements/install.in # flask-babel bcrypt==3.1.7 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # -r requirements/install.in -billiard==3.6.4.0 + # via -r requirements/install.in +billiard==4.2.0 # via # -c requirements/install.pip # -c requirements/test.pip # celery -bleach==3.1.0 +bleach==3.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -71,7 +68,7 @@ boto3==1.26.102 # -c requirements/test.pip # -r requirements/install.in # flask-storage -botocore==1.29.104 +botocore==1.29.165 # via # -c requirements/install.pip # -c requirements/test.pip @@ -82,7 +79,7 @@ cachelib==0.9.0 # -c requirements/install.pip # -c requirements/test.pip # flask-caching -celery==4.3.0 +celery==5.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -93,12 +90,12 @@ celerybeat-mongo==0.2.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -certifi==2021.5.30 +certifi==2024.2.2 # via # -c requirements/install.pip # -c requirements/test.pip # requests -cffi==1.14.6 +cffi==1.16.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -109,27 +106,46 @@ chardet==3.0.4 # -c requirements/install.pip # -c requirements/test.pip # requests -click==8.0.0 +click==8.1.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in + # celery + # click-didyoumean + # click-plugins + # click-repl # flask # geomet # mkdocs +click-didyoumean==0.3.0 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery +click-plugins==1.1.1 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery +click-repl==0.3.0 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery cryptography==2.8 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in # authlib -dnspython==2.1.0 +dnspython==2.6.1 # via # -c requirements/install.pip # -c requirements/test.pip # email-validator # pymongo -email-validator==1.1.3 +email-validator==2.1.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -166,7 +182,7 @@ flask==2.1.2 # flask-sitemap # flask-storage # flask-wtf -flask-babel==3.1.0 +flask-babel==4.0.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -208,7 +224,7 @@ flask-mongoengine==1.0.0 # -c requirements/test.pip # -r requirements/install.in # flask-storage -flask-navigation==0.2.0 +flask-navigation @ git+https://github.com/krs-novice/flask-navigation-ks.git@develop # via # -c requirements/install.pip # -c requirements/test.pip @@ -228,7 +244,7 @@ flask-security-too==5.1.2 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -flask-sitemap==0.3.0 +flask-sitemap==0.4.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -255,7 +271,7 @@ geomet==1.1.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -ghp-import==2.0.2 +ghp-import==2.1.0 # via mkdocs html2text==2019.9.26 # via @@ -269,15 +285,7 @@ idna==2.10 # email-validator # requests # urlextract -importlib-metadata==6.0.0 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # flask - # jsonschema - # markdown - # mkdocs -isodate==0.6.0 +isodate==0.6.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -308,7 +316,7 @@ jsonschema==3.2.0 # -c requirements/install.pip # -c requirements/test.pip # flask-restx -kombu[redis]==4.4.0 +kombu[redis]==5.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -319,12 +327,12 @@ langdetect==1.0.9 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -lxml==4.4.2 +lxml==4.9.3 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -markdown==3.4.4 +markdown==3.3.7 # via mkdocs markupsafe==2.1.2 # via @@ -356,9 +364,11 @@ netaddr==0.7.19 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -packaging==23.1 +packaging==24.0 # via + # -c requirements/install.pip # -c requirements/test.pip + # bleach # mkdocs passlib==1.7.4 # via @@ -373,9 +383,14 @@ pillow==9.2.0 # -c requirements/test.pip # flask-storage # pydenticon -platformdirs==4.0.0 +platformdirs==4.2.0 # via mkdocs -pycparser==2.20 +prompt-toolkit==3.0.43 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # click-repl +pycparser==2.21 # via # -c requirements/install.pip # -c requirements/test.pip @@ -392,31 +407,30 @@ pymongo==4.3.3 # -r requirements/install.in # celerybeat-mongo # mongoengine -pyparsing==2.4.7 +pyparsing==3.1.2 # via # -c requirements/install.pip # -c requirements/test.pip # rdflib -pyrsistent==0.18.0 +pyrsistent==0.20.0 # via # -c requirements/install.pip # -c requirements/test.pip # jsonschema -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in # botocore + # celery # faker # ghp-import -pytz==2022.7 +pytz==2024.1 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in - # babel - # celery # flask-babel # flask-restx pyyaml==6.0.1 @@ -430,13 +444,13 @@ rdflib==6.0.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -redis==3.3.11 +redis==4.5.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in # kombu -regex==2021.8.3 +regex==2023.12.25 # via # -c requirements/install.pip # -c requirements/test.pip @@ -446,7 +460,7 @@ requests==2.24.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -s3transfer==0.6.0 +s3transfer==0.6.2 # via # -c requirements/install.pip # -c requirements/test.pip @@ -480,22 +494,22 @@ text-unidecode==1.3 # -c requirements/install.pip # -c requirements/test.pip # faker -tlds==2021080800 +tlds==2024030600 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -typing-extensions==4.7.1 +tzdata==2024.1 # via - # importlib-metadata - # mkdocs - # platformdirs + # -c requirements/install.pip + # -c requirements/test.pip + # celery unidecode==0.4.21 # via # -c requirements/install.pip # -c requirements/test.pip # awesome-slugify -uritools==3.0.2 +uritools==4.0.2 # via # -c requirements/install.pip # -c requirements/test.pip @@ -511,19 +525,25 @@ urllib3==1.25.11 # -c requirements/test.pip # botocore # requests -vine==1.3.0 +vine==5.1.0 # via # -c requirements/install.pip # -c requirements/test.pip # amqp # celery + # kombu voluptuous==0.11.7 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -watchdog==2.1.6 +watchdog==4.0.0 # via mkdocs +wcwidth==0.2.13 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # prompt-toolkit webencodings==0.5.1 # via # -c requirements/install.pip @@ -551,11 +571,6 @@ wtforms-json==0.3.5 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -zipp==3.12.1 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/install.in b/requirements/install.in index 0c292ac38d..1388c13fbb 100644 --- a/requirements/install.in +++ b/requirements/install.in @@ -2,16 +2,16 @@ authlib==0.14.3 awesome-slugify==1.6.5 Babel==2.12.1 bcrypt==3.1.7 -bleach==3.1.0 +bleach==3.3.1 blinker==1.4 boto3>=1.26 -celery==4.3.0 +celery==5.3.1 celerybeat-mongo==0.2.0 -click==8.0 +click==8.1.2 cryptography==2.8 factory-boy==2.12.0 Faker==3.0.0 -flask-babel==3.1.0 +flask-babel==4.0.0 Flask-Caching==2.0.2 Flask-CDN==1.5.3 Flask-Cors==3.0.8 @@ -20,27 +20,27 @@ Flask-Gravatar==0.5.0 Flask-Login==0.6.2 Flask-Mail==0.9.1 flask-mongoengine==1.0.0 -Flask-Navigation==0.2.0 +Flask-Navigation@git+https://github.com/krs-novice/flask-navigation-ks.git@develop flask-restx==1.0.5 Flask-Security-Too==5.1.2 -Flask-Sitemap==0.3.0 +Flask-Sitemap==0.4.0 Flask-WTF==1.0.1 Flask==2.1.2 geojson==2.5.0 geomet==1.1.0 html2text==2019.9.26 Jinja2==3.1.2 -kombu[redis]==4.4.0 +kombu[redis]==5.3.1 langdetect==1.0.9 -lxml==4.4.2 +lxml==4.9.3 mistune==0.8.4 mongoengine==0.27.0 netaddr==0.7.19 pydenticon==0.3.1 pymongo==4.3.3 -python-dateutil==2.8.1 -pytz==2022.7 -redis==3.3.11 +python-dateutil==2.8.2 +pytz==2024.1 +redis==4.5.2 rdflib==6.0.0 requests==2.24.0 speaklater==1.3 diff --git a/requirements/install.pip b/requirements/install.pip index a416dff318..7f5a209a95 100644 --- a/requirements/install.pip +++ b/requirements/install.pip @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.7 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --output-file=requirements/install.pip requirements/install.in # -amqp==2.6.1 +amqp==5.2.0 # via kombu aniso8601==9.0.1 # via flask-restx appdirs==1.4.4 # via urlextract -attrs==21.2.0 +attrs==23.2.0 # via jsonschema authlib==0.14.3 # via -r requirements/install.in @@ -22,9 +22,9 @@ babel==2.12.1 # flask-babel bcrypt==3.1.7 # via -r requirements/install.in -billiard==3.6.4.0 +billiard==4.2.0 # via celery -bleach==3.1.0 +bleach==3.3.1 # via -r requirements/install.in blinker==1.4 # via @@ -38,40 +38,50 @@ boto3==1.26.102 # via # -r requirements/install.in # flask-storage -botocore==1.29.104 +botocore==1.29.165 # via # boto3 # s3transfer cachelib==0.9.0 # via flask-caching -celery==4.3.0 +celery==5.3.1 # via # -r requirements/install.in # celerybeat-mongo celerybeat-mongo==0.2.0 # via -r requirements/install.in -certifi==2021.5.30 +certifi==2024.2.2 # via requests -cffi==1.14.6 +cffi==1.16.0 # via # bcrypt # cryptography chardet==3.0.4 # via requests -click==8.0.0 +click==8.1.2 # via # -r requirements/install.in + # celery + # click-didyoumean + # click-plugins + # click-repl # flask # geomet +click-didyoumean==0.3.0 + # via celery +click-plugins==1.1.1 + # via celery +click-repl==0.3.0 + # via celery cryptography==2.8 # via # -r requirements/install.in # authlib -dnspython==2.1.0 +dnspython==2.6.1 # via # email-validator # pymongo -email-validator==1.1.3 +email-validator==2.1.1 # via # flask-security-too # wtforms @@ -99,7 +109,7 @@ flask==2.1.2 # flask-sitemap # flask-storage # flask-wtf -flask-babel==3.1.0 +flask-babel==4.0.0 # via -r requirements/install.in flask-caching==2.0.2 # via -r requirements/install.in @@ -119,7 +129,7 @@ flask-mongoengine==1.0.0 # via # -r requirements/install.in # flask-storage -flask-navigation==0.2.0 +flask-navigation @ git+https://github.com/krs-novice/flask-navigation-ks.git@develop # via -r requirements/install.in flask-principal==0.4.0 # via flask-security-too @@ -127,7 +137,7 @@ flask-restx==1.0.5 # via -r requirements/install.in flask-security-too==5.1.2 # via -r requirements/install.in -flask-sitemap==0.3.0 +flask-sitemap==0.4.0 # via -r requirements/install.in flask-storage==1.3.2 # via -r requirements/install.in @@ -147,11 +157,7 @@ idna==2.10 # email-validator # requests # urlextract -importlib-metadata==6.0.0 - # via - # flask - # jsonschema -isodate==0.6.0 +isodate==0.6.1 # via rdflib itsdangerous==2.1.2 # via @@ -169,13 +175,13 @@ jmespath==1.0.1 # botocore jsonschema==3.2.0 # via flask-restx -kombu[redis]==4.4.0 +kombu[redis]==5.3.1 # via # -r requirements/install.in # celery langdetect==1.0.9 # via -r requirements/install.in -lxml==4.4.2 +lxml==4.9.3 # via -r requirements/install.in markupsafe==2.1.2 # via @@ -192,13 +198,17 @@ mongoengine==0.27.0 # flask-mongoengine netaddr==0.7.19 # via -r requirements/install.in +packaging==24.0 + # via bleach passlib==1.7.4 # via flask-security-too pillow==9.2.0 # via # flask-storage # pydenticon -pycparser==2.20 +prompt-toolkit==3.0.43 + # via click-repl +pycparser==2.21 # via cffi pydenticon==0.3.1 # via -r requirements/install.in @@ -207,33 +217,32 @@ pymongo==4.3.3 # -r requirements/install.in # celerybeat-mongo # mongoengine -pyparsing==2.4.7 +pyparsing==3.1.2 # via rdflib -pyrsistent==0.18.0 +pyrsistent==0.20.0 # via jsonschema -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -r requirements/install.in # botocore + # celery # faker -pytz==2022.7 +pytz==2024.1 # via # -r requirements/install.in - # babel - # celery # flask-babel # flask-restx rdflib==6.0.0 # via -r requirements/install.in -redis==3.3.11 +redis==4.5.2 # via # -r requirements/install.in # kombu -regex==2021.8.3 +regex==2023.12.25 # via awesome-slugify requests==2.24.0 # via -r requirements/install.in -s3transfer==0.6.0 +s3transfer==0.6.2 # via boto3 six==1.16.0 # via @@ -253,13 +262,13 @@ stringdist==1.0.9 # via -r requirements/install.in text-unidecode==1.3 # via faker -tlds==2021080800 +tlds==2024030600 # via -r requirements/install.in -typing-extensions==4.7.1 - # via importlib-metadata +tzdata==2024.1 + # via celery unidecode==0.4.21 # via awesome-slugify -uritools==3.0.2 +uritools==4.0.2 # via urlextract urlextract==0.14.0 # via -r requirements/install.in @@ -267,12 +276,15 @@ urllib3==1.25.11 # via # botocore # requests -vine==1.3.0 +vine==5.1.0 # via # amqp # celery + # kombu voluptuous==0.11.7 # via -r requirements/install.in +wcwidth==0.2.13 + # via prompt-toolkit webencodings==0.5.1 # via bleach werkzeug==2.2.2 @@ -290,8 +302,6 @@ wtforms[email]==3.0.1 # wtforms-json wtforms-json==0.3.5 # via -r requirements/install.in -zipp==3.12.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/report.pip b/requirements/report.pip index 010bfc9b87..19133d01cd 100644 --- a/requirements/report.pip +++ b/requirements/report.pip @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.7 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --output-file=requirements/report.pip requirements/report.in # -amqp==2.6.1 +amqp==5.2.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -19,7 +19,7 @@ appdirs==1.4.4 # -c requirements/install.pip # -c requirements/test.pip # urlextract -attrs==21.2.0 +attrs==23.2.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -41,16 +41,13 @@ babel==2.12.1 # -r requirements/install.in # flask-babel bcrypt==3.1.7 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # -r requirements/install.in -billiard==3.6.4.0 + # via -r requirements/install.in +billiard==4.2.0 # via # -c requirements/install.pip # -c requirements/test.pip # celery -bleach==3.1.0 +bleach==3.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -71,7 +68,7 @@ boto3==1.26.102 # -c requirements/test.pip # -r requirements/install.in # flask-storage -botocore==1.29.104 +botocore==1.29.165 # via # -c requirements/install.pip # -c requirements/test.pip @@ -82,7 +79,7 @@ cachelib==0.9.0 # -c requirements/install.pip # -c requirements/test.pip # flask-caching -celery==4.3.0 +celery==5.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -93,12 +90,12 @@ celerybeat-mongo==0.2.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -certifi==2021.5.30 +certifi==2024.2.2 # via # -c requirements/install.pip # -c requirements/test.pip # requests -cffi==1.14.6 +cffi==1.16.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -109,13 +106,32 @@ chardet==3.0.4 # -c requirements/install.pip # -c requirements/test.pip # requests -click==8.0.0 +click==8.1.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in + # celery + # click-didyoumean + # click-plugins + # click-repl # flask # geomet +click-didyoumean==0.3.0 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery +click-plugins==1.1.1 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery +click-repl==0.3.0 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # celery coverage[toml]==7.2.3 # via # -r requirements/report.in @@ -126,22 +142,18 @@ cryptography==2.8 # -c requirements/test.pip # -r requirements/install.in # authlib -dnspython==2.1.0 +dnspython==2.6.1 # via # -c requirements/install.pip # -c requirements/test.pip # email-validator # pymongo -email-validator==1.1.3 +email-validator==2.1.1 # via # -c requirements/install.pip # -c requirements/test.pip # flask-security-too # wtforms -exceptiongroup==1.1.0 - # via - # -c requirements/test.pip - # pytest factory-boy==2.12.0 # via # -c requirements/install.pip @@ -176,7 +188,7 @@ flask==2.1.2 # flask-storage # flask-wtf # pytest-flask -flask-babel==3.1.0 +flask-babel==4.0.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -218,7 +230,7 @@ flask-mongoengine==1.0.0 # -c requirements/test.pip # -r requirements/install.in # flask-storage -flask-navigation==0.2.0 +flask-navigation @ git+https://github.com/krs-novice/flask-navigation-ks.git@develop # via # -c requirements/install.pip # -c requirements/test.pip @@ -238,7 +250,7 @@ flask-security-too==5.1.2 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -flask-sitemap==0.3.0 +flask-sitemap==0.4.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -281,20 +293,11 @@ idna==2.10 # email-validator # requests # urlextract -importlib-metadata==6.0.0 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # flake8 - # flask - # jsonschema - # pluggy - # pytest iniconfig==2.0.0 # via # -c requirements/test.pip # pytest -isodate==0.6.0 +isodate==0.6.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -324,7 +327,7 @@ jsonschema==3.2.0 # -c requirements/install.pip # -c requirements/test.pip # flask-restx -kombu[redis]==4.4.0 +kombu[redis]==5.3.1 # via # -c requirements/install.pip # -c requirements/test.pip @@ -335,7 +338,7 @@ langdetect==1.0.9 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -lxml==4.4.2 +lxml==4.9.3 # via # -c requirements/install.pip # -c requirements/test.pip @@ -371,9 +374,11 @@ netaddr==0.7.19 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -packaging==23.1 +packaging==24.0 # via + # -c requirements/install.pip # -c requirements/test.pip + # bleach # pytest # pytest-sugar passlib==1.7.4 @@ -387,13 +392,18 @@ pillow==9.2.0 # -c requirements/test.pip # flask-storage # pydenticon -pluggy==0.13.1 +pluggy==1.4.0 # via # -c requirements/test.pip # pytest +prompt-toolkit==3.0.43 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # click-repl pycodestyle==2.7.0 # via flake8 -pycparser==2.20 +pycparser==2.21 # via # -c requirements/install.pip # -c requirements/test.pip @@ -412,12 +422,12 @@ pymongo==4.3.3 # -r requirements/install.in # celerybeat-mongo # mongoengine -pyparsing==2.4.7 +pyparsing==3.1.2 # via # -c requirements/install.pip # -c requirements/test.pip # rdflib -pyrsistent==0.18.0 +pyrsistent==0.20.0 # via # -c requirements/install.pip # -c requirements/test.pip @@ -449,20 +459,19 @@ pytest-sugar==0.9.7 # via # -c requirements/test.pip # -r requirements/test.in -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in # botocore + # celery # faker -pytz==2022.7 +pytz==2024.1 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in - # babel - # celery # flask-babel # flask-restx rdflib==6.0.0 @@ -470,13 +479,13 @@ rdflib==6.0.0 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -redis==3.3.11 +redis==4.5.2 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in # kombu -regex==2021.8.3 +regex==2023.12.25 # via # -c requirements/install.pip # -c requirements/test.pip @@ -491,7 +500,7 @@ requests-mock==1.10.0 # via # -c requirements/test.pip # -r requirements/test.in -s3transfer==0.6.0 +s3transfer==0.6.2 # via # -c requirements/install.pip # -c requirements/test.pip @@ -521,7 +530,7 @@ stringdist==1.0.9 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -termcolor==2.2.0 +termcolor==2.4.0 # via # -c requirements/test.pip # pytest-sugar @@ -530,24 +539,22 @@ text-unidecode==1.3 # -c requirements/install.pip # -c requirements/test.pip # faker -tlds==2021080800 +tlds==2024030600 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -tomli==2.0.1 +tzdata==2024.1 # via + # -c requirements/install.pip # -c requirements/test.pip - # coverage - # pytest -typing-extensions==4.7.1 - # via importlib-metadata + # celery unidecode==0.4.21 # via # -c requirements/install.pip # -c requirements/test.pip # awesome-slugify -uritools==3.0.2 +uritools==4.0.2 # via # -c requirements/install.pip # -c requirements/test.pip @@ -563,17 +570,23 @@ urllib3==1.25.11 # -c requirements/test.pip # botocore # requests -vine==1.3.0 +vine==5.1.0 # via # -c requirements/install.pip # -c requirements/test.pip # amqp # celery + # kombu voluptuous==0.11.7 # via # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in +wcwidth==0.2.13 + # via + # -c requirements/install.pip + # -c requirements/test.pip + # prompt-toolkit webencodings==0.5.1 # via # -c requirements/install.pip @@ -602,11 +615,6 @@ wtforms-json==0.3.5 # -c requirements/install.pip # -c requirements/test.pip # -r requirements/install.in -zipp==3.12.1 - # via - # -c requirements/install.pip - # -c requirements/test.pip - # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/sentry.pip b/requirements/sentry.pip deleted file mode 100644 index 47cd9ec920..0000000000 --- a/requirements/sentry.pip +++ /dev/null @@ -1 +0,0 @@ -sentry-sdk[flask] >= 1.1.0 diff --git a/requirements/test.pip b/requirements/test.pip index 175198e8d6..bb35cd0d0e 100644 --- a/requirements/test.pip +++ b/requirements/test.pip @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.7 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --output-file=requirements/test.pip requirements/test.in # -amqp==2.6.1 +amqp==5.2.0 # via # -c requirements/install.pip # kombu @@ -16,7 +16,7 @@ appdirs==1.4.4 # via # -c requirements/install.pip # urlextract -attrs==21.2.0 +attrs==23.2.0 # via # -c requirements/install.pip # jsonschema @@ -34,14 +34,12 @@ babel==2.12.1 # -r requirements/install.in # flask-babel bcrypt==3.1.7 - # via - # -c requirements/install.pip - # -r requirements/install.in -billiard==3.6.4.0 + # via -r requirements/install.in +billiard==4.2.0 # via # -c requirements/install.pip # celery -bleach==3.1.0 +bleach==3.3.1 # via # -c requirements/install.pip # -r requirements/install.in @@ -59,7 +57,7 @@ boto3==1.26.102 # -c requirements/install.pip # -r requirements/install.in # flask-storage -botocore==1.29.104 +botocore==1.29.165 # via # -c requirements/install.pip # boto3 @@ -68,7 +66,7 @@ cachelib==0.9.0 # via # -c requirements/install.pip # flask-caching -celery==4.3.0 +celery==5.3.1 # via # -c requirements/install.pip # -r requirements/install.in @@ -77,11 +75,11 @@ celerybeat-mongo==0.2.0 # via # -c requirements/install.pip # -r requirements/install.in -certifi==2021.5.30 +certifi==2024.2.2 # via # -c requirements/install.pip # requests -cffi==1.14.6 +cffi==1.16.0 # via # -c requirements/install.pip # bcrypt @@ -90,29 +88,43 @@ chardet==3.0.4 # via # -c requirements/install.pip # requests -click==8.0.0 +click==8.1.2 # via # -c requirements/install.pip # -r requirements/install.in + # celery + # click-didyoumean + # click-plugins + # click-repl # flask # geomet +click-didyoumean==0.3.0 + # via + # -c requirements/install.pip + # celery +click-plugins==1.1.1 + # via + # -c requirements/install.pip + # celery +click-repl==0.3.0 + # via + # -c requirements/install.pip + # celery cryptography==2.8 # via # -c requirements/install.pip # -r requirements/install.in # authlib -dnspython==2.1.0 +dnspython==2.6.1 # via # -c requirements/install.pip # email-validator # pymongo -email-validator==1.1.3 +email-validator==2.1.1 # via # -c requirements/install.pip # flask-security-too # wtforms -exceptiongroup==1.1.0 - # via pytest factory-boy==2.12.0 # via # -c requirements/install.pip @@ -142,7 +154,7 @@ flask==2.1.2 # flask-storage # flask-wtf # pytest-flask -flask-babel==3.1.0 +flask-babel==4.0.0 # via # -c requirements/install.pip # -r requirements/install.in @@ -176,7 +188,7 @@ flask-mongoengine==1.0.0 # -c requirements/install.pip # -r requirements/install.in # flask-storage -flask-navigation==0.2.0 +flask-navigation @ git+https://github.com/krs-novice/flask-navigation-ks.git@develop # via # -c requirements/install.pip # -r requirements/install.in @@ -192,7 +204,7 @@ flask-security-too==5.1.2 # via # -c requirements/install.pip # -r requirements/install.in -flask-sitemap==0.3.0 +flask-sitemap==0.4.0 # via # -c requirements/install.pip # -r requirements/install.in @@ -226,16 +238,9 @@ idna==2.10 # email-validator # requests # urlextract -importlib-metadata==6.0.0 - # via - # -c requirements/install.pip - # flask - # jsonschema - # pluggy - # pytest iniconfig==2.0.0 # via pytest -isodate==0.6.0 +isodate==0.6.1 # via # -c requirements/install.pip # rdflib @@ -260,7 +265,7 @@ jsonschema==3.2.0 # via # -c requirements/install.pip # flask-restx -kombu[redis]==4.4.0 +kombu[redis]==5.3.1 # via # -c requirements/install.pip # -r requirements/install.in @@ -269,7 +274,7 @@ langdetect==1.0.9 # via # -c requirements/install.pip # -r requirements/install.in -lxml==4.4.2 +lxml==4.9.3 # via # -c requirements/install.pip # -r requirements/install.in @@ -296,8 +301,10 @@ netaddr==0.7.19 # via # -c requirements/install.pip # -r requirements/install.in -packaging==23.1 +packaging==24.0 # via + # -c requirements/install.pip + # bleach # pytest # pytest-sugar passlib==1.7.4 @@ -309,9 +316,13 @@ pillow==9.2.0 # -c requirements/install.pip # flask-storage # pydenticon -pluggy==0.13.1 +pluggy==1.4.0 # via pytest -pycparser==2.20 +prompt-toolkit==3.0.43 + # via + # -c requirements/install.pip + # click-repl +pycparser==2.21 # via # -c requirements/install.pip # cffi @@ -325,11 +336,11 @@ pymongo==4.3.3 # -r requirements/install.in # celerybeat-mongo # mongoengine -pyparsing==2.4.7 +pyparsing==3.1.2 # via # -c requirements/install.pip # rdflib -pyrsistent==0.18.0 +pyrsistent==0.20.0 # via # -c requirements/install.pip # jsonschema @@ -348,30 +359,29 @@ pytest-mock==3.10.0 # via -r requirements/test.in pytest-sugar==0.9.7 # via -r requirements/test.in -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -c requirements/install.pip # -r requirements/install.in # botocore + # celery # faker -pytz==2022.7 +pytz==2024.1 # via # -c requirements/install.pip # -r requirements/install.in - # babel - # celery # flask-babel # flask-restx rdflib==6.0.0 # via # -c requirements/install.pip # -r requirements/install.in -redis==3.3.11 +redis==4.5.2 # via # -c requirements/install.pip # -r requirements/install.in # kombu -regex==2021.8.3 +regex==2023.12.25 # via # -c requirements/install.pip # awesome-slugify @@ -382,7 +392,7 @@ requests==2.24.0 # requests-mock requests-mock==1.10.0 # via -r requirements/test.in -s3transfer==0.6.0 +s3transfer==0.6.2 # via # -c requirements/install.pip # boto3 @@ -408,25 +418,25 @@ stringdist==1.0.9 # via # -c requirements/install.pip # -r requirements/install.in -termcolor==2.2.0 +termcolor==2.4.0 # via pytest-sugar text-unidecode==1.3 # via # -c requirements/install.pip # faker -tlds==2021080800 +tlds==2024030600 # via # -c requirements/install.pip # -r requirements/install.in -tomli==2.0.1 - # via pytest -typing-extensions==4.7.1 - # via importlib-metadata +tzdata==2024.1 + # via + # -c requirements/install.pip + # celery unidecode==0.4.21 # via # -c requirements/install.pip # awesome-slugify -uritools==3.0.2 +uritools==4.0.2 # via # -c requirements/install.pip # urlextract @@ -439,15 +449,20 @@ urllib3==1.25.11 # -c requirements/install.pip # botocore # requests -vine==1.3.0 +vine==5.1.0 # via # -c requirements/install.pip # amqp # celery + # kombu voluptuous==0.11.7 # via # -c requirements/install.pip # -r requirements/install.in +wcwidth==0.2.13 + # via + # -c requirements/install.pip + # prompt-toolkit webencodings==0.5.1 # via # -c requirements/install.pip @@ -472,10 +487,6 @@ wtforms-json==0.3.5 # via # -c requirements/install.pip # -r requirements/install.in -zipp==3.12.1 - # via - # -c requirements/install.pip - # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/setup.py b/setup.py index ebf0fc145c..19eaed69de 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ def pip(filename): author_email='opendatateam@data.gouv.fr', packages=find_packages(), include_package_data=True, - python_requires='>=3.7,<3.10', + python_requires='>=3.8', install_requires=install_requires, entry_points={ 'console_scripts': [ diff --git a/udata/auth/views.py b/udata/auth/views.py index 61a1cfe6bf..bdebb2aee2 100644 --- a/udata/auth/views.py +++ b/udata/auth/views.py @@ -11,8 +11,8 @@ from flask_security.views import send_login from flask_security.views import token_login from flask_security.utils import ( - send_mail, do_flash, get_message, get_token_status, hash_data, - login_user, logout_user, verify_hash) + check_and_get_token_status, do_flash, get_message, get_within_delta, hash_data, + login_user, logout_user, send_mail, verify_hash) from werkzeug.local import LocalProxy from udata.i18n import lazy_gettext as _ from udata.uris import endpoint_for @@ -49,12 +49,13 @@ def send_change_email_confirmation_instructions(user, new_email): def confirm_change_email_token_status(token): - expired, invalid, user, token_data = get_token_status( - token, 'confirm', 'CONFIRM_EMAIL', return_data=True) + expired, invalid, token_data = check_and_get_token_status( + token, 'confirm', get_within_delta('CONFIRM_EMAIL_WITHIN')) new_email = None - if not invalid and user: - _, token_email_hash, new_email = token_data + if not invalid and token_data: + user, token_email_hash, new_email = token_data + user = _datastore.find_user(fs_uniquifier=user) invalid = not verify_hash(token_email_hash, user.email) return expired, invalid, user, new_email diff --git a/udata/core/jobs/api.py b/udata/core/jobs/api.py index d33bbdf7f6..1c7248d9b5 100644 --- a/udata/core/jobs/api.py +++ b/udata/core/jobs/api.py @@ -1,7 +1,7 @@ from celery import states from celery.result import AsyncResult from celery.utils import get_full_cls_name -from celery.utils.encoding import safe_repr +from kombu.utils.encoding import safe_repr from flask import request from udata.api import api, API, fields diff --git a/udata/mongo/document.py b/udata/mongo/document.py index 11cf2412fd..6a5730bba2 100644 --- a/udata/mongo/document.py +++ b/udata/mongo/document.py @@ -1,6 +1,6 @@ import logging -from collections import Iterable +from collections.abc import Iterable from flask_mongoengine import Document