Skip to content

Commit

Permalink
Merge ecc7572 into 408577e
Browse files Browse the repository at this point in the history
  • Loading branch information
ItIsJordan committed Oct 25, 2022
2 parents 408577e + ecc7572 commit 1011544
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 38 deletions.
3 changes: 2 additions & 1 deletion hepdata/modules/records/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,9 @@ def set_data_review_status():

if user_allowed_to_perform_action(recid):
if all_tables:
data_ids = db.session.query(DataSubmission.id) \
data_id_rows = db.session.query(DataSubmission.id) \
.filter_by(publication_recid=recid, version=version).distinct()
data_ids = [i[0] for i in data_id_rows]
else:
data_ids = [int(request.form['data_recid'])]

Expand Down
72 changes: 36 additions & 36 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
Babel==2.9.1
beautifulsoup4==4.5.1
bleach==3.3.0
celery==5.1.2
click==7.1.1
Babel==2.10.3
beautifulsoup4==4.11.1
bleach==5.0.1
celery==5.2.7
click==8.1.3
datacite==1.1.2
email-validator==1.1.0
Flask==1.1.4
Flask-CeleryExt==0.4.1
Flask-Cors==3.0.9
Flask-Login==0.3.2
gunicorn==19.5.0
email-validator==1.3.0
Flask==2.0.3
Flask-CeleryExt==0.4.3
Flask-Cors==3.0.10
Flask-Login==0.4.1
gunicorn==20.1.0
hepdata-converter-ws-client==0.2.2
hepdata-validator==0.3.3
invenio-access==1.4.2 # Indirect (needed by invenio-admin)
invenio-accounts==1.4.9
invenio-admin==1.3.0
invenio-app==1.3.1
invenio-assets==1.3.0
invenio-base==1.2.5
invenio-access==1.4.4 # Indirect (needed by invenio-admin)
invenio-accounts==1.4.13
invenio-admin==1.3.2
invenio-app==1.3.1 # Fixed as 1.3.4 caused error in E2E tests.
invenio-assets==1.3.0 # Temporarily fixing as 1.3.1 causes CI error
invenio-base==1.2.13
invenio-config==1.0.3
invenio-db==1.0.9
invenio-logging[sentry-sdk]==1.3.0
invenio-oauthclient==1.5.1
invenio-pidstore==1.2.2
invenio-records==1.4.0
invenio-search[opensearch1]==2.0.0
invenio-theme==1.3.8
invenio-db==1.0.13 # v1.0.14 causes all E2E tests to fail
invenio-logging[sentry-sdk]==1.3.2
invenio-oauthclient==1.5.4
invenio-pidstore==1.2.3
invenio-records==2.0.0
invenio-search[opensearch1]==2.1.0
invenio-theme==1.4.0
invenio-userprofiles==1.2.1
Jinja2==2.11.3
jsmin==3.0.0
jsmin==3.0.1
lxml==4.9.1
MarkupSafe==2.0.1
msgpack==0.6.2
MarkupSafe==2.1.1
msgpack==1.0.4
pluggy==0.13.1 # Fixed version to make sure it works with jsonresolve and pytest
psycopg2-binary==2.9.3
python-dateutil==2.8.1
pyyaml==5.4.1
requests==2.27.1
responses==0.10.9
python-dateutil==2.8.2
pyyaml==6.0
requests==2.28.1
responses==0.21.0
speaklater==1.3
SQLAlchemy-Continuum==1.3.11 # Indirect: see https://github.com/inveniosoftware/invenio-records/issues/250
SQLAlchemy==1.3.23
SQLAlchemy-Continuum==1.3.13 # Indirect: see https://github.com/inveniosoftware/invenio-records/issues/250
SQLAlchemy==1.3.24
SQLAlchemy-Utils==0.35.0
timestring==1.6.4
twitter==1.15.0
unicodeit==0.7.0
twitter==1.19.6
unicodeit==0.7.2
werkzeug==2.0.3 # Has issue with jinja v3.1.3 if updated
1 change: 0 additions & 1 deletion tests/urls_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

def test_url_modify(app):
with app.app_context():

url_path = modify_query('os_search.search', **{'date': '2001, 2002'})
assert(url_path == '/search/?date=2001%2C+2002')

Expand Down

0 comments on commit 1011544

Please sign in to comment.