Skip to content

Commit 68c042d

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

File tree

2 files changed

+56
-51
lines changed

2 files changed

+56
-51
lines changed

‎requirements-local-forks.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
-e git+https://github.com/cernanalysispreservation/invenio-celery.git@mock/v1.1.1#egg=invenio-celery
2-
-e git+https://github.com/inveniosoftware/invenio-logging@94bc56117593eae62ba975d576e8c7b991311c0d#egg=invenio-logging[sentry,sentry-sdk]
3-
-e git+https://github.com/cernanalysispreservation/[email protected]#egg=invenio-oauthclient
4-
-e git+https://github.com/cernanalysispreservation/[email protected]#egg=invenio-userprofiles
5-
-e git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new#egg=invenio-indexer
6-
-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
8-
-e git+https://github.com/parths007/invenio-records-rest.git@os-2-new#egg=invenio-records-rest
1+
# -e git+https://github.com/cernanalysispreservation/invenio-celery.git@mock/v1.1.1#egg=invenio-celery
2+
# -e git+https://github.com/inveniosoftware/invenio-logging@94bc56117593eae62ba975d576e8c7b991311c0d#egg=invenio-logging[sentry,sentry-sdk]
3+
# -e git+https://github.com/cernanalysispreservation/[email protected]#egg=invenio-oauthclient
4+
# -e git+https://github.com/cernanalysispreservation/[email protected]#egg=invenio-userprofiles
5+
# -e git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new#egg=invenio-indexer
6+
# -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
8+
# -e git+https://github.com/parths007/invenio-records-rest.git@os-2-new#egg=invenio-records-rest
99
-e git+https://github.com/parths007/[email protected]#egg=invenio-search[opensearch2]
1010
-e git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5#egg=invenio-files-rest
11-
-e git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files
11+
# -e git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files
1212
-e git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2#egg=invenio-deposit
1313
-e git+https://github.com/cernanalysispreservation/invenio-query-parser.git@os#egg=invenio-query-parser

‎setup.py

+47-42
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@
3838

3939
install_requires = [
4040
# CAP Base
41-
'Flask==1.1',
42-
'click==8.0.0',
43-
'jinja2==3.0.3',
44-
'itsdangerous==2.0.1',
45-
'werkzeug==1.0.1',
46-
'Flask-Caching==1.5.0',
41+
# 'Flask',
42+
# 'click',
43+
'jinja2',
44+
# 'itsdangerous',
45+
# 'werkzeug',
46+
# 'Flask-Caching',
4747
'Flask-Debugtoolbar',
48-
'flask-wtf==0.15.1',
49-
'flask-login==0.4.1',
48+
#'flask-wtf',
49+
# 'flask-login',
5050

5151
# CAP specific libraries
5252
'jsonref>=1.0.0',
5353
'jsonresolver>=0.3.2',
5454
'PyGithub>=1.35',
5555
'python-gitlab>=1.0.2',
56-
'python-ldap==3.1.0',
56+
'python-ldap>=3.1.0',
5757
'python-cern-sso-krb==1.3.3',
5858
'gssapi>=1.7.3',
5959
'Authlib==0.15.1',
@@ -76,47 +76,52 @@
7676
'reana-client==0.8.1',
7777
'reana-commons[yadage,snakemake]==0.8.4',
7878

79-
# Invenio Base Deps
80-
'invenio-base==1.2.5',
81-
'invenio-admin==1.1.2',
82-
'invenio-assets==1.1.3',
83-
'invenio-formatter==1.0.2',
84-
'invenio-mail==1.0.2',
85-
'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',
89-
9079
# Invenio Auth Deps
91-
'invenio-access==1.3.0',
92-
'invenio-accounts==1.1.1',
93-
'invenio-oauth2server==1.0.4',
94-
'invenio-oauthclient @ git+https://github.com/cernanalysispreservation/[email protected]',
95-
'invenio-userprofiles @ git+https://github.com/cernanalysispreservation/[email protected]',
80+
'invenio-access>=1.4.1,<1.5.0',
81+
'invenio-accounts>=1.4.3,<1.5.0',
82+
'invenio-accounts-rest>=1.0.0a4',
83+
'invenio-oauth2server>=1.3.2,<1.4.0',
84+
'invenio-oauthclient @ git+https://github.com/parths007/[email protected]',
85+
'invenio-userprofiles @ git+https://github.com/parths007/[email protected]',
86+
87+
# Invenio Base Deps
88+
'invenio-admin>=1.3.0,<1.4.0',
89+
'invenio-assets>=1.2.5,<1.3.0',
90+
'invenio-formatter>=1.1.0,<1.2.0',
91+
'invenio-logging>=1.3.0,<1.4.0',
92+
'invenio-mail>=1.0.2,<1.1.0',
93+
'invenio-rest>=1.2.3,<1.3.0',
94+
'invenio-theme>=1.3.5,<1.4.0',
9695

9796
# Invenio Metadata Deps
98-
'invenio-indexer @ git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new',
99-
'invenio-jsonschemas @ git+https://github.com/cernanalysispreservation/invenio-jsonschemas.git@v1.0.1',
100-
'invenio-oaiserver @ git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new',
101-
'invenio-pidstore==1.1.0',
102-
'invenio-records-rest @ git+https://github.com/parths007/invenio-records-rest.git@os-2-new',
103-
'invenio-records-ui==1.0.1',
104-
'invenio-records==1.3.0',
105-
'invenio-search-ui==1.1.1',
106-
'invenio-search @ git+https://github.com/parths007/invenio-search.git@v1.2.3#egg=invenio-search',
97+
'invenio-indexer>=2.1.0,<3.0.0',
98+
'invenio-jsonschemas @ git+https://github.com/parths007/invenio-jsonschemas.git@v1.1.5',
99+
'invenio-pidstore>=1.2.1,<2.0.0',
100+
'invenio-records-rest>=2.0.0,<3.0.0',
101+
'invenio-records-ui>=1.2.0,<1.3.0',
102+
'invenio-records>=2.0.0,<3.0.0',
103+
'invenio-search-ui>=2.0.0,<2.1.0',
104+
'invenio-deposit @ git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2',
105+
'invenio-query-parser @ git+https://github.com/cernanalysispreservation/invenio-query-parser.git@os',
107106

108107
# Invenio Files deps
109-
'invenio-files-rest @ git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5',
110-
'invenio-records-files @ git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files',
108+
'invenio-files-rest>=1.2.0,<2.0.0',
109+
'invenio-records-files>=1.2.1,<1.3.0',
111110

112111
# Database deps
113-
'invenio-db[postgresql,versioning]==1.0.13',
112+
'invenio-db[postgresql,versioning]>=1.0.14',
113+
114+
# Search deps
115+
'invenio-search @ git+https://github.com/parths007/[email protected]',
116+
117+
# Required
118+
'invenio-app>=1.3.1,<1.4.0',
119+
'invenio-base>=1.2.5,<2.0.0',
120+
'invenio-cache>=1.1.0,<1.2.0',
121+
'invenio-celery>=1.2.2,<1.3.0',
122+
'invenio-config>=1.0.3,<1.1.0',
123+
'invenio-i18n>=2.0.0,<3.0.0',
114124

115-
# Invenio required deps
116-
'invenio-deposit @ git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2',
117-
'invenio-accounts-rest==1.0.0a4',
118-
'invenio-query-parser @ git+https://github.com/cernanalysispreservation/invenio-query-parser.git@os',
119-
'invenio[auth,base,metadata,postgresql]==3.2.0',
120125
]
121126

122127
packages = find_packages()

0 commit comments

Comments
 (0)