global: upgrade for invenio os2 support

Signed-off-by: Parth Shandilya <parth.shandilya@cern.ch>
cernanalysispreservation · Apr 18, 2023 · 68c042d · 68c042d
1 parent cba1d1a
commit 68c042d
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 51 deletions.
diff --git a/requirements-local-forks.txt b/requirements-local-forks.txt
@@ -1,13 +1,13 @@
--e git+https://github.com/cernanalysispreservation/invenio-celery.git@mock/v1.1.1#egg=invenio-celery
--e git+https://github.com/inveniosoftware/invenio-logging@94bc56117593eae62ba975d576e8c7b991311c0d#egg=invenio-logging[sentry,sentry-sdk]
--e git+https://github.com/cernanalysispreservation/invenio-oauthclient.git@v1.1.3#egg=invenio-oauthclient
--e git+https://github.com/cernanalysispreservation/invenio-userprofiles.git@v1.0.1#egg=invenio-userprofiles
--e git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new#egg=invenio-indexer
--e git+https://github.com/cernanalysispreservation/invenio-jsonschemas.git@v1.0.1#egg=invenio-jsonschemas
--e git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new#egg=invenio-oaiserver
--e git+https://github.com/parths007/invenio-records-rest.git@os-2-new#egg=invenio-records-rest
+# -e git+https://github.com/cernanalysispreservation/invenio-celery.git@mock/v1.1.1#egg=invenio-celery
+# -e git+https://github.com/inveniosoftware/invenio-logging@94bc56117593eae62ba975d576e8c7b991311c0d#egg=invenio-logging[sentry,sentry-sdk]
+# -e git+https://github.com/cernanalysispreservation/invenio-oauthclient.git@v1.1.3#egg=invenio-oauthclient
+# -e git+https://github.com/cernanalysispreservation/invenio-userprofiles.git@v1.0.1#egg=invenio-userprofiles
+# -e git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new#egg=invenio-indexer
+# -e git+https://github.com/cernanalysispreservation/invenio-jsonschemas.git@v1.0.1#egg=invenio-jsonschemas
+# -e git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new#egg=invenio-oaiserver
+# -e git+https://github.com/parths007/invenio-records-rest.git@os-2-new#egg=invenio-records-rest
 -e git+https://github.com/parths007/invenio-search.git@v1.2.3#egg=invenio-search[opensearch2]
 -e git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5#egg=invenio-files-rest
--e git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files
+# -e git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files
 -e git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2#egg=invenio-deposit
 -e git+https://github.com/cernanalysispreservation/invenio-query-parser.git@os#egg=invenio-query-parser
diff --git a/setup.py b/setup.py
@@ -38,22 +38,22 @@
 
 install_requires = [
     # CAP Base
-    'Flask==1.1',
-    'click==8.0.0',
-    'jinja2==3.0.3',
-    'itsdangerous==2.0.1',
-    'werkzeug==1.0.1',
-    'Flask-Caching==1.5.0',
+    # 'Flask',
+    # 'click',
+    'jinja2',
+    # 'itsdangerous',
+    # 'werkzeug',
+    # 'Flask-Caching',
     'Flask-Debugtoolbar',
-    'flask-wtf==0.15.1',
-    'flask-login==0.4.1',
+    #'flask-wtf',
+    # 'flask-login',
 
     # CAP specific libraries
     'jsonref>=1.0.0',
     'jsonresolver>=0.3.2',
     'PyGithub>=1.35',
     'python-gitlab>=1.0.2',
-    'python-ldap==3.1.0',
+    'python-ldap>=3.1.0',
     'python-cern-sso-krb==1.3.3',
     'gssapi>=1.7.3',
     'Authlib==0.15.1',
@@ -76,47 +76,52 @@
     'reana-client==0.8.1',
     'reana-commons[yadage,snakemake]==0.8.4',
 
-    # Invenio Base Deps
-    'invenio-base==1.2.5',
-    'invenio-admin==1.1.2',
-    'invenio-assets==1.1.3',
-    'invenio-formatter==1.0.2',
-    'invenio-mail==1.0.2',
-    'invenio-rest==1.1.2',
-    'invenio-theme==1.1.4',
-    'invenio-celery@git+https://github.com/cernanalysispreservation/invenio-celery.git@mock/v1.1.1#egg=invenio-celery',
-    'invenio-logging[sentry,sentry-sdk] @ git+https://github.com/inveniosoftware/invenio-logging@94bc56117593eae62ba975d576e8c7b991311c0d',
-
     # Invenio Auth Deps
-    'invenio-access==1.3.0',
-    'invenio-accounts==1.1.1',
-    'invenio-oauth2server==1.0.4',
-    'invenio-oauthclient @ git+https://github.com/cernanalysispreservation/invenio-oauthclient.git@v1.1.3',
-    'invenio-userprofiles @ git+https://github.com/cernanalysispreservation/invenio-userprofiles.git@v1.0.1',
+    'invenio-access>=1.4.1,<1.5.0',
+    'invenio-accounts>=1.4.3,<1.5.0',
+    'invenio-accounts-rest>=1.0.0a4',
+    'invenio-oauth2server>=1.3.2,<1.4.0',
+    'invenio-oauthclient @ git+https://github.com/parths007/invenio-oauthclient.git@v1.4.0',
+    'invenio-userprofiles @ git+https://github.com/parths007/invenio-userprofiles.git@v1.2.4',
+
+    # Invenio Base Deps
+    'invenio-admin>=1.3.0,<1.4.0',
+    'invenio-assets>=1.2.5,<1.3.0',
+    'invenio-formatter>=1.1.0,<1.2.0',
+    'invenio-logging>=1.3.0,<1.4.0',
+    'invenio-mail>=1.0.2,<1.1.0',
+    'invenio-rest>=1.2.3,<1.3.0',
+    'invenio-theme>=1.3.5,<1.4.0',
 
     # Invenio Metadata Deps
-    'invenio-indexer @ git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new',
-    'invenio-jsonschemas @ git+https://github.com/cernanalysispreservation/invenio-jsonschemas.git@v1.0.1',
-    'invenio-oaiserver @ git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new',
-    'invenio-pidstore==1.1.0',
-    'invenio-records-rest @ git+https://github.com/parths007/invenio-records-rest.git@os-2-new',
-    'invenio-records-ui==1.0.1',
-    'invenio-records==1.3.0',
-    'invenio-search-ui==1.1.1',
-    'invenio-search @ git+https://github.com/parths007/invenio-search.git@v1.2.3#egg=invenio-search',
+    'invenio-indexer>=2.1.0,<3.0.0',
+    'invenio-jsonschemas @ git+https://github.com/parths007/invenio-jsonschemas.git@v1.1.5',
+    'invenio-pidstore>=1.2.1,<2.0.0',
+    'invenio-records-rest>=2.0.0,<3.0.0',
+    'invenio-records-ui>=1.2.0,<1.3.0',
+    'invenio-records>=2.0.0,<3.0.0',
+    'invenio-search-ui>=2.0.0,<2.1.0',
+    'invenio-deposit @ git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2',
+    'invenio-query-parser @ git+https://github.com/cernanalysispreservation/invenio-query-parser.git@os',
 
     # Invenio Files deps
-    'invenio-files-rest @ git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5',
-    'invenio-records-files @ git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files',
+    'invenio-files-rest>=1.2.0,<2.0.0',
+    'invenio-records-files>=1.2.1,<1.3.0',
 
     # Database deps
-    'invenio-db[postgresql,versioning]==1.0.13',
+    'invenio-db[postgresql,versioning]>=1.0.14',
+
+    # Search deps
+    'invenio-search @ git+https://github.com/parths007/invenio-search.git@v2.2.0',
+
+    # Required
+    'invenio-app>=1.3.1,<1.4.0',
+    'invenio-base>=1.2.5,<2.0.0',
+    'invenio-cache>=1.1.0,<1.2.0',
+    'invenio-celery>=1.2.2,<1.3.0',
+    'invenio-config>=1.0.3,<1.1.0',
+    'invenio-i18n>=2.0.0,<3.0.0',
 
-    # Invenio required deps
-    'invenio-deposit @ git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2',
-    'invenio-accounts-rest==1.0.0a4',
-    'invenio-query-parser @ git+https://github.com/cernanalysispreservation/invenio-query-parser.git@os',
-    'invenio[auth,base,metadata,postgresql]==3.2.0',
 ]
 
 packages = find_packages()