Skip to content

Commit 8721b7f

Browse files
committed
global: upgrade for invenio os2 support
Signed-off-by: Parth Shandilya <[email protected]>
1 parent cba1d1a commit 8721b7f

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

cap/config.py

-3
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ def _(x):
223223
APP_ALLOWED_HOSTS.append(host.strip())
224224
else:
225225
APP_ALLOWED_HOSTS.append(hosts)
226-
# OAI-PMH
227-
# =======
228-
OAISERVER_ID_PREFIX = 'oai:analysispreservation.cern.ch:'
229226

230227
# Debug
231228
# =====

requirements-local-forks.txt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
-e git+https://github.com/cernanalysispreservation/[email protected]#egg=invenio-userprofiles
55
-e git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new#egg=invenio-indexer
66
-e git+https://github.com/cernanalysispreservation/[email protected]#egg=invenio-jsonschemas
7-
-e git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new#egg=invenio-oaiserver
87
-e git+https://github.com/parths007/invenio-records-rest.git@os-2-new#egg=invenio-records-rest
98
-e git+https://github.com/parths007/[email protected]#egg=invenio-search[opensearch2]
109
-e git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5#egg=invenio-files-rest

setup.py

+12-9
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
# CAP specific libraries
5252
'jsonref>=1.0.0',
53+
'dojson==1.4.0',
5354
'jsonresolver>=0.3.2',
5455
'PyGithub>=1.35',
5556
'python-gitlab>=1.0.2',
@@ -76,28 +77,27 @@
7677
'reana-client==0.8.1',
7778
'reana-commons[yadage,snakemake]==0.8.4',
7879

79-
# Invenio Base Deps
80+
# Invenio Base Deps
8081
'invenio-base==1.2.5',
8182
'invenio-admin==1.1.2',
8283
'invenio-assets==1.1.3',
8384
'invenio-formatter==1.0.2',
8485
'invenio-mail==1.0.2',
8586
'invenio-rest==1.1.2',
86-
'invenio-theme==1.1.4',
87-
'invenio-celery@git+https://github.com/cernanalysispreservation/invenio-celery.git@mock/v1.1.1#egg=invenio-celery',
88-
'invenio-logging[sentry,sentry-sdk] @ git+https://github.com/inveniosoftware/invenio-logging@94bc56117593eae62ba975d576e8c7b991311c0d',
87+
'invenio-theme==1.3.4',
88+
'invenio-celery==1.2.5',
89+
'invenio-logging[sentry,sentry-sdk]==1.3.2',
8990

9091
# Invenio Auth Deps
9192
'invenio-access==1.3.0',
92-
'invenio-accounts==1.1.1',
93+
'invenio-accounts==1.2.1',
9394
'invenio-oauth2server==1.0.4',
94-
'invenio-oauthclient @ git+https://github.com/cernanalysispreservation/invenio-oauthclient.git@v1.1.3',
95-
'invenio-userprofiles @ git+https://github.com/cernanalysispreservation/invenio-userprofiles.git@v1.0.1',
95+
'invenio-oauthclient @ git+https://github.com/parths007/invenio-oauthclient.git@v1.2.1',
96+
'invenio-userprofiles @ git+https://github.com/parths007/invenio-userprofiles.git@v1.2.4',
9697

9798
# Invenio Metadata Deps
9899
'invenio-indexer @ git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new',
99100
'invenio-jsonschemas @ git+https://github.com/cernanalysispreservation/[email protected]',
100-
'invenio-oaiserver @ git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new',
101101
'invenio-pidstore==1.1.0',
102102
'invenio-records-rest @ git+https://github.com/parths007/invenio-records-rest.git@os-2-new',
103103
'invenio-records-ui==1.0.1',
@@ -116,7 +116,10 @@
116116
'invenio-deposit @ git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2',
117117
'invenio-accounts-rest==1.0.0a4',
118118
'invenio-query-parser @ git+https://github.com/cernanalysispreservation/invenio-query-parser.git@os',
119-
'invenio[auth,base,metadata,postgresql]==3.2.0',
119+
'invenio-app>=1.2.3,<1.3.0',
120+
'invenio-cache>=1.0.0,<1.1.0',
121+
'invenio-config>=1.0.2,<1.1.0',
122+
'invenio-i18n==1.2.0',
120123
]
121124

122125
packages = find_packages()

0 commit comments

Comments
 (0)