global: upgrade for invenio os2 support

Signed-off-by: Parth Shandilya <[email protected]>

cap/config.py

@@ -223,9 +223,6 @@ def _(x):
             APP_ALLOWED_HOSTS.append(host.strip())
     else:
         APP_ALLOWED_HOSTS.append(hosts)
-# OAI-PMH
-# =======
-OAISERVER_ID_PREFIX = 'oai:analysispreservation.cern.ch:'
 
 # Debug
 # =====

requirements-local-forks.txt

@@ -4,7 +4,6 @@
 -e git+https://github.com/cernanalysispreservation/[email protected]#egg=invenio-userprofiles
 -e git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new#egg=invenio-indexer
 -e git+https://github.com/cernanalysispreservation/[email protected]#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/[email protected]#egg=invenio-search[opensearch2]
 -e git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5#egg=invenio-files-rest

setup.py

@@ -50,6 +50,7 @@
 
     # CAP specific libraries
     'jsonref>=1.0.0',
+    'dojson==1.4.0',
     'jsonresolver>=0.3.2',
     'PyGithub>=1.35',
     'python-gitlab>=1.0.2',
@@ -76,28 +77,27 @@
     'reana-client==0.8.1',
     'reana-commons[yadage,snakemake]==0.8.4',
 
-    # Invenio Base Deps
+    # 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-celery==1.2.5',
     '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-accounts==1.2.0',
     'invenio-oauth2server==1.0.4',
-    'invenio-oauthclient @ git+https://github.com/cernanalysispreservation/invenio-oauthclient.git@v1.1.3',
+    'invenio-oauthclient @ git+https://github.com/parths007/invenio-oauthclient.git@master-cap',
     'invenio-userprofiles @ git+https://github.com/cernanalysispreservation/[email protected]',
 
     # Invenio Metadata Deps
     'invenio-indexer @ git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new',
     'invenio-jsonschemas @ git+https://github.com/cernanalysispreservation/[email protected]',
-    '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',
@@ -116,7 +116,10 @@
     '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',
+    'invenio-app>=1.2.3,<1.3.0',
+    'invenio-cache>=1.0.0,<1.1.0',
+    'invenio-config>=1.0.2,<1.1.0',
+    'invenio-i18n==1.2.0',
 ]
 
 packages = find_packages()