diff --git a/requirements.packages.txt b/requirements.packages.txt deleted file mode 100644 index 6383989cb..000000000 --- a/requirements.packages.txt +++ /dev/null @@ -1,210 +0,0 @@ -alembic==1.10.4 -amqp==5.2.0 -aniso8601==9.0.1 -appdirs==1.4.4 -arrow==0.17.0 -asttokens==2.4.1 -async-timeout==4.0.3 -attrs==23.2.0 -Babel==2.15.0 -base32-lib==1.0.2 -beautifulsoup4==4.12.3 -billiard==3.6.4.0 -bleach==6.1.0 -blinker==1.8.2 -cachelib==0.9.0 -cairocffi==1.7.1 -CairoSVG==1.0.22 -celery==5.2.7 -certifi==2024.7.4 -cffi==1.16.0 -charset-normalizer==3.3.2 -click==8.1.7 -click-default-group==1.2.4 -click-didyoumean==0.3.1 -click-plugins==1.1.1 -click-repl==0.3.0 -commonmark==0.9.1 -counter-robots==2018.6 -cryptography==42.0.8 -datacite==1.2.0 -dcxml==0.1.1 -decorator==5.1.1 -defusedxml==0.7.1 -Deprecated==1.2.14 -dictdiffer==0.9.0 -dnspython==2.6.1 -dojson==1.5.0 -email_validator==2.2.0 -Events==0.5 -exceptiongroup==1.2.2 -executing==2.0.1 -fastjsonschema==2.20.0 -Flask==2.2.5 -Flask-Admin==1.6.1 -Flask-Alembic==2.0.1 -flask-babel==4.0.0 -Flask-Breadcrumbs==0.5.1 -Flask-Caching==2.3.0 -Flask-CeleryExt==0.5.0 -Flask-Collect-Invenio==1.4.0 -Flask-Cors==4.0.1 -flask-iiif==1.0.0 -Flask-KVSession-Invenio==0.6.3 -Flask-Limiter==2.9.2 -Flask-Login==0.6.3 -Flask-Mail==0.9.1 -flask-menu==1.0.1 -Flask-OAuthlib==0.9.6 -Flask-Principal==0.4.0 -Flask-RESTful==0.3.10 -Flask-Security-Invenio==3.3.3 -flask-shell-ipython==0.5.1 -Flask-SQLAlchemy==2.5.1 -flask-talisman==0.8.1 -flask-webpackext==1.0.2 -Flask-WTF==1.2.1 -fs==2.4.16 -ftfy==6.2.0 -future==1.0.0 -github3.py==4.0.1 -greenlet==3.0.3 -idna==3.7 -IDUtils==1.4.2 -importlib_metadata==8.0.0 -importlib_resources==6.4.0 -infinity==1.5 -intervals==0.9.2 -invenio-access==2.0.0 -invenio-accounts==5.0.1 -invenio-admin==1.5.0 -invenio-app==1.5.0 -invenio-assets==3.0.3 -invenio-base==1.4.0 -invenio-cache==1.3.0 -invenio-celery==1.3.1 -invenio-config==1.0.4 -invenio-db==1.1.5 -invenio-files-rest==2.2.0 -invenio-formatter==2.0.3 -invenio-i18n==2.1.1 -invenio-iiif==1.2.0 -invenio-indexer==2.3.0 -invenio-jsonschemas==1.1.4 -invenio-logging==2.1.1 -invenio-mail==2.1.1 -invenio-oaiserver==2.2.1 -invenio-oauth2server==2.3.1 -invenio-oauthclient==3.5.1 -invenio-opendefinition==2.0.0a2 -invenio-pages==1.0.0a7 -invenio-pidstore==1.3.1 -invenio-previewer==2.2.1 -invenio-queues==1.0.1 -invenio-records==2.3.0 -invenio-records-files==1.2.1 -invenio-records-rest==2.4.1 -invenio-records-ui==1.2.1 -invenio-rest==1.3.1 -invenio-search==2.4.1 -invenio-search-ui==2.8.7 -invenio-sequencegenerator==1.0.0a3 -invenio-stats==4.1.0 -invenio-theme==3.2.0 -invenio-userprofiles==1.2.5 -ipython==8.18.1 -isbnid==0.4.6 -itsdangerous==2.0.1 -jedi==0.19.1 -Jinja2==3.1.4 -jsmin==3.0.1 -jsonpatch==1.33 -jsonpointer==3.0.0 -jsonref==1.1.0 -jsonresolver==0.3.2 -jsonschema==4.9.1 -jupyter_client==8.6.2 -jupyter_core==5.7.2 -jupyterlab_pygments==0.3.0 -kombu==5.3.7 -limits==3.13.0 -lxml==5.2.2 -lxml_html_clean==0.1.1 -Mako==1.3.5 -MarkupSafe==2.1.5 -marshmallow==3.21.3 -matplotlib-inline==0.1.7 -maxminddb==2.6.2 -maxminddb-geolite2==2018.703 -mistune==3.0.2 -msgpack==1.0.8 -nbclient==0.10.0 -nbconvert==7.16.4 -nbformat==5.10.4 -oauthlib==2.1.0 -opensearch-dsl==2.1.0 -opensearch-py==2.6.0 -ordered-set==4.1.0 -packaging==24.1 -pandocfilters==1.5.1 -parso==0.8.4 -passlib==1.7.4 -pexpect==4.9.0 -pillow==10.4.0 -platformdirs==4.2.2 -pluggy==0.13.1 -prompt_toolkit==3.0.47 -psycopg2-binary==2.9.9 -ptyprocess==0.7.0 -pure-eval==0.2.2 -pyasn1==0.6.0 -pyasn1_modules==0.4.0 -pycountry==22.3.5 -pycparser==2.22 -Pygments==2.18.0 -PyJWT==2.8.0 -pynpm==0.2.0 -pyrsistent==0.20.0 -python-dateutil==2.9.0.post0 -python-geoip==1.2 -python-ldap==3.4.4 -pytz==2024.1 -pywebpack==2.0.0 -pyzmq==26.0.3 -redis==5.0.7 -requests==2.32.3 -requests-oauthlib==1.1.0 -requests-toolbelt==1.0.0 -rich==12.6.0 -sentry-sdk==1.45.0 -simplejson==3.19.2 -simplekv==0.14.1 -six==1.16.0 -soupsieve==2.5 -speaklater==1.3 -SQLAlchemy==1.4.52 -SQLAlchemy-Continuum==1.4.1 -SQLAlchemy-Utils==0.38.3 -stack-data==0.6.3 -tinycss2==1.3.0 -tornado==6.4.1 -traitlets==5.14.3 -typing_extensions==4.12.2 -ua-parser==0.18.0 -uritemplate==4.1.1 -uritemplate.py==1.0.1 -uritools==4.0.3 -urllib3==1.26.19 -validators==0.33.0 -vine==5.1.0 -Wand==0.6.13 -watchdog==2.2.1 -wcwidth==0.2.13 -webargs==5.5.3 -webencodings==0.5.1 -Werkzeug==2.2.3 -wrapt==1.16.0 -WTForms==2.3.3 -WTForms-Alchemy==0.18.0 -WTForms-Components==0.10.5 -zipp==3.19.2 diff --git a/requirements.txt b/requirements.txt index 99b95bc32..06df718df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,9 +3,9 @@ amqp==5.3.1 aniso8601==9.0.1 appdirs==1.4.4 arrow==0.17.0 -asttokens==2.4.1 +asttokens==3.0.0 async-timeout==5.0.1 -attrs==24.2.0 +attrs==24.3.0 babel==2.16.0 base32-lib==1.0.2 beautifulsoup4==4.12.3 @@ -16,7 +16,7 @@ cachelib==0.9.0 cairocffi==1.7.1 CairoSVG==1.0.22 celery==5.3.6 -certifi==2024.8.30 +certifi==2024.12.14 cffi==1.17.1 charset-normalizer==3.4.0 click==8.1.7 @@ -26,7 +26,7 @@ click-plugins==1.1.1 click-repl==0.3.0 commonmark==0.9.1 counter-robots==2018.6 -cryptography==43.0.3 +cryptography==44.0.0 datacite==1.2.0 dcxml==0.1.1 decorator==5.1.1 @@ -40,7 +40,7 @@ email_validator==2.2.0 Events==0.5 exceptiongroup==1.2.2 executing==2.1.0 -fastjsonschema==2.20.0 +fastjsonschema==2.21.1 Flask==2.2.5 Flask-Admin==1.6.1 Flask-Alembic==2.0.1 @@ -50,8 +50,8 @@ Flask-Caching==2.3.0 Flask-CeleryExt==0.5.0 Flask-Collect-Invenio==1.4.0 Flask-Cors==5.0.0 -flask-iiif==1.1.1 -Flask-KVSession-Invenio==0.6.3 +flask-iiif==1.2.0 +Flask-KVSession-Invenio==0.6.4 Flask-Limiter==2.9.2 Flask-Login==0.6.3 Flask-Mail==0.9.1 @@ -59,11 +59,11 @@ flask-menu==1.0.1 Flask-OAuthlib==0.9.6 Flask-Principal==0.4.0 Flask-RESTful==0.3.10 -Flask-Security-Invenio==3.3.3 +Flask-Security-Invenio==3.4.0 flask-shell-ipython==0.5.3 Flask-SQLAlchemy==2.5.1 flask-talisman==0.8.1 -flask-webpackext==1.0.2 +flask-webpackext==2.0.0 Flask-WTF==1.2.2 fs==2.4.16 ftfy==6.3.1 @@ -77,41 +77,41 @@ importlib_resources==6.4.5 infinity==1.5 intervals==0.9.2 invenio-access==2.1.0 -invenio-accounts==5.1.5 +invenio-accounts==5.1.7 invenio-admin==1.5.1 -invenio-app==1.5.0 -invenio-assets==3.0.3 +invenio-app==1.5.1 +invenio-assets==3.1.0 invenio-base==1.4.0 -invenio-cache==1.3.0 -invenio-celery==1.3.1 +invenio-cache==1.3.1 +invenio-celery==1.3.2 invenio-config==1.0.4 invenio-db==1.3.1 -invenio-files-rest==2.2.2 -invenio-formatter==2.0.3 -invenio-i18n==2.1.2 +invenio-files-rest==2.2.4 +invenio-formatter==2.0.4 +invenio-i18n==2.2.0 invenio-iiif==1.2.0 invenio-indexer==2.4.0 -invenio-jsonschemas==1.1.4 -invenio-logging==2.1.1 +invenio-jsonschemas==1.1.5 +invenio-logging==2.1.4 invenio-mail==2.1.1 -invenio-oaiserver==2.2.3 -invenio-oauth2server==2.4.0 +invenio-oaiserver==2.3.0 +invenio-oauth2server==2.3.1 invenio-oauthclient==3.5.1 invenio-opendefinition==2.0.0a2 invenio-pages==1.0.0a7 -invenio-pidstore==1.3.2 -invenio-previewer==2.2.1 +invenio-pidstore==1.3.4 +invenio-previewer==2.2.2 invenio-queues==1.0.1 invenio-records==2.4.1 invenio-records-files==1.2.1 invenio-records-rest==2.4.1 -invenio-records-ui==1.2.1 -invenio-rest==1.3.1 +invenio-records-ui==1.2.2 +invenio-rest==1.5.0 invenio-search==2.4.1 invenio-search-ui==2.9.1 invenio-sequencegenerator==1.0.0a3 -invenio-stats==4.2.0 -invenio-theme==3.5.0 +invenio-stats==4.2.1 +invenio-theme==3.5.2 invenio-userprofiles==1.2.5 ipython==8.18.1 isbnlib==3.10.14 @@ -128,10 +128,10 @@ jupyter_client==8.6.3 jupyter_core==5.7.2 jupyterlab_pygments==0.3.0 kombu==5.4.2 -limits==3.13.0 +limits==3.14.1 lxml==5.3.0 lxml_html_clean==0.4.1 -Mako==1.3.6 +Mako==1.3.8 MarkupSafe==3.0.2 marshmallow==3.23.1 matplotlib-inline==0.1.7 @@ -139,12 +139,12 @@ maxminddb==2.6.2 maxminddb-geolite2==2018.703 mistune==3.0.2 msgpack==1.1.0 -nbclient==0.10.0 +nbclient==0.10.1 nbconvert==7.16.4 nbformat==5.10.4 oauthlib==2.1.0 opensearch-dsl==2.1.0 -opensearch-py==2.7.1 +opensearch-py==2.8.0 ordered-set==4.1.0 packaging==24.2 pandocfilters==1.5.1 @@ -152,7 +152,7 @@ parso==0.8.4 passlib==1.7.4 pexpect==4.9.0 pillow==11.0.0 -platformdirs==4.2.0 +platformdirs==4.3.6 pluggy==0.13.1 prompt_toolkit==3.0.48 psycopg2-binary==2.9.10 @@ -163,16 +163,16 @@ pyasn1_modules==0.4.1 pycountry==22.3.5 pycparser==2.22 Pygments==2.18.0 -PyJWT==2.10.0 +PyJWT==2.10.1 pynpm==0.2.0 pyrsistent==0.20.0 python-dateutil==2.9.0.post0 python-geoip==1.2 python-ldap==3.4.4 -pytz==2024.2 -pywebpack==2.0.1 +pytz==2024.1 +pywebpack==2.1.0 pyzmq==26.2.0 -redis==5.2.0 +redis==5.2.1 requests==2.32.3 requests-oauthlib==1.1.0 requests-toolbelt==1.0.0 @@ -180,7 +180,7 @@ rich==12.6.0 sentry-sdk==1.45.1 simplejson==3.19.3 simplekv==0.14.1 -six==1.15.0 +six==1.17.0 soupsieve==2.6 speaklater==1.3 SQLAlchemy==1.4.54 @@ -188,10 +188,12 @@ SQLAlchemy-Continuum==1.4.1 SQLAlchemy-Utils==0.38.3 stack-data==0.6.3 tinycss2==1.4.0 -tornado==6.4.1 +tornado==6.4.2 traitlets==5.14.3 typing_extensions==4.12.2 -ua-parser==0.18.0 +tzdata==2024.2 +ua-parser==1.0.0 +ua-parser-builtins==0.18.0.post1 uritemplate==4.1.1 uritemplate.py==1.0.1 uritools==4.0.3 @@ -204,8 +206,8 @@ wcwidth==0.2.13 webargs==5.5.3 webencodings==0.5.1 Werkzeug==2.2.3 -wrapt==1.16.0 -WTForms==3.1.2 +wrapt==1.17.0 +WTForms==2.3.3 WTForms-Alchemy==0.18.0 -WTForms-Components==0.11.0 +WTForms-Components==0.10.5 zipp==3.21.0 diff --git a/setup.cfg b/setup.cfg index a504b059d..7e2567e66 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # This file is part of CDS. -# Copyright (C) 2015, 2016 CERN. +# Copyright (C) 2024 CERN. # # CDS is free software; you can redistribute it # and/or modify it under the terms of the GNU General Public License as @@ -48,47 +48,48 @@ include_package_data = True python_requires = >=3.9 install_requires = # Invenio core modules - invenio-app>=1.5.0,<1.6.0 - # upper pinned to minor due to flask 2.3 upgrade changes dependencies + invenio-app>=1.5.0,<2.0.0 invenio-base>=1.3.0,<2.0.0 invenio-cache>=1.1.1,<2.0.0 invenio-celery>=1.3.0,<2.0.0 - invenio-config>=1.0.3,<1.1.0 + invenio-config>=1.0.3,<2.0.0 invenio-i18n>=2.0.0,<3.0.0 invenio-db[postgresql]>=1.1.0,<2.0.0 invenio-search[opensearch2]>=2.4.1,<3.0.0 # Invenio base bundle - invenio-admin>=1.5.0,<1.6.0 + invenio-admin>=1.5.0,<2.0.0 invenio-assets>=3.0.0,<4.0.0 invenio-formatter>=2.0.0,<3.0.0 - invenio-logging[sentry_sdk]>=2.0.0,<3.0.0 + invenio-logging>=2.0.0,<3.0.0 invenio-mail>=2.0.0,<3.0.0 - invenio-rest>=1.3.0,<1.4.0 + invenio-rest>=1.5.0,<2.0.0 invenio-theme>=3.0.0,<4.0.0 # Invenio auth bundle" invenio-access>=2.0.0,<3.0.0 invenio-accounts>=5.0.0,<6.0.0 invenio-oauth2server>=2.0.0,<3.0.0 invenio-oauthclient>=3.0.0,<4.0.0 - invenio-userprofiles>=1.2.4,<1.3.0 + invenio-userprofiles>=1.2.4,<2.0.0 # Invenio metadata bundle invenio-indexer>=2.2.0,<3.0.0 - invenio-jsonschemas>=1.1.4,<1.2.0 - invenio-oaiserver>=2.2.0,<2.3.0 - invenio-pidstore>=1.3.0,<1.4.0 + invenio-jsonschemas>=1.1.4,<2.0.0 + invenio-oaiserver>=2.2.0,<3.0.0 + invenio-pidstore>=1.3.0,<2.0.0 invenio-records-rest>=2.2.0,<3.0.0 invenio-records>=2.2.1,<3.0.0 - invenio-records-ui>=1.2.1,<1.3.0 + invenio-records-ui>=1.2.1,<2.0.0 invenio-search-ui>=2.4.0,<3.0.0 # Invenio files bundle, with only invenio-files-rest" invenio-files-rest>=2.0.0,<3.0.0 invenio-records-files>=1.2.1,<2.0.0 - invenio-iiif>=1.2.0,<1.3.0, - # Extra deps of Videos, + invenio-iiif>=1.2.0,<2.0.0 + # Extra deps of Videos invenio-opendefinition>=2.0.0a2,<3.0.0 invenio-pages>=1.0.0a7,<2.0.0 invenio-previewer>=2.2.0,<3.0.0 invenio-stats>=4.0.0,<5.0.0 + # sentry-sdk removed from invenio-logging + sentry-sdk[flask]>=1.0.0,<2.0.0 pycountry>=20.0.0,<23.0.0 # needed to have namedtuple json serialized as dict simplejson>=3.8.1,<4.0.0 @@ -102,6 +103,9 @@ install_requires = # Pinned due to before_first_request deprecation https://flask.palletsprojects.com/en/2.2.x/api/#flask.Flask.before_first_request Flask>=2.2.0,<2.3.0 Werkzeug>=2.2.0,<2.3.0 + flask_menu>=1.0.0,<2.0.0 + # 3.0.0 introduces breaking changes, requires fixes in flask-admin + WTForms<3.0.0 # extras arrow>=0.7.0,<1.0.0 CairoSVG>=1.0.20,<2.0.0