Commit e086fc91 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merge branch 'v1.0.6' into 'master'

Merge for release v1.0.6

See merge request !601
parents 535d0c11 4a2379a2
Pipeline #127966 passed with stages
in 44 minutes and 8 seconds
version:
label: "v1.0.0"
label: "1.0.6"
isBeta: true
usesBetaData: true
officialUrl: "https://nomad-lab.eu/prod/rae/gui"
......@@ -28,7 +28,7 @@ worker:
nomadNodeType: "prod-worker"
elastic:
host: elasticsearch.elasticsearch.svc.cluster.local
host: elasticsearch.elasticsearch-7.svc.cluster.local
port: 9200
mongo:
......
version:
label: "v1.0.3"
label: "1.0.6"
isBeta: true
usesBetaData: false
officialUrl: "https://nomad-lab.eu/prod/rae/gui"
......@@ -36,7 +36,7 @@ worker:
nomadNodeType: "prod-worker"
elastic:
host: elasticsearch.elasticsearch.svc.cluster.local
host: elasticsearch.elasticsearch-7.svc.cluster.local
port: 9200
mongo:
......
## Default values for nomad@FAIRDI
version:
label: "1.0.5"
label: "1.0.6"
isTest: false
isBeta: false
usesBetaData: false
......
......@@ -19,7 +19,7 @@ pytz==2021.1
aniso8601==7.0.0
ase==3.19.0
python-keycloak==0.26.1
elasticsearch-dsl==6.4.0
elasticsearch-dsl==7.4.0
pydantic==1.8.2
jmespath==0.10.0
httpx==0.22.0
......@@ -47,7 +47,7 @@ bitarray==2.3.5
# [infrastructure]
optimade[mongo]==0.14.0
structlog==20.1.0
elasticsearch==6.4.0
elasticsearch==7.17.1
msgpack==0.5.6
celery[redis]==4.4.7
mongoengine==0.19.1
......@@ -111,4 +111,4 @@ devtools==0.8.0
mkdocs==1.2.3
mkdocs-material==8.1.1
mkdocs-material-extensions==1.0.3
mkdocs-macros-plugin==0.6.3
\ No newline at end of file
mkdocs-macros-plugin==0.6.3
......@@ -190,7 +190,7 @@ class TestEditRepo():
assert self.mongo(1, reviewers=[])
self.assert_elastic(1, comment=None)
self.assert_elastic(1, references=None)
self.assert_elastic(1, references=[])
self.assert_elastic(1, authors=[test_user.user_id])
self.assert_elastic(1, viewers=[test_user.user_id])
......
......@@ -70,15 +70,12 @@ parser_examples = [
('parsers/qbox', 'tests/data/parsers/qbox/01_h2ogs.r'),
('parser/onetep', 'tests/data/parsers/onetep/fluor/12-difluoroethane.out'),
('parsers/eels', 'tests/data/parsers/eels.json'),
('parsers/xps', 'tests/data/parsers/xps/multiple_channels.xy'),
('parsers/lobster', 'tests/data/parsers/lobster/NaCl/lobsterout'),
('parsers/aflow', 'tests/data/parsers/aflow/Ag1Co1O2_ICSD_246157/aflowlib.json'),
('parsers/mp', 'tests/data/parsers/mp/mp-1/materials.json'),
('parsers/asr', 'tests/data/parsers/asr/archive_ccdc26c4f32546c5a00ad03a093b73dc.json'),
('parsers/psi4', 'tests/data/parsers/psi4/adc1/output.ref'),
('parsers/yambo', 'tests/data/parsers/yambo/hBN/r-10b_1Ry_HF_and_locXC_gw0_em1d_ppa'),
# ('parsers/aptfim', 'tests/data/parsers/aptfim.aptfim'),
# ('parsers/mpes', 'tests/data/parsers/mpes.meta'),
('parsers/archive', 'tests/data/parsers/archive.json')
]
......@@ -90,7 +87,7 @@ for parser, mainfile in parser_examples:
fixed_parser_examples.append((parser, mainfile))
parser_examples = fixed_parser_examples
correct_num_output_files = 123
correct_num_output_files = 122
def create_reference(data, pretty):
......
......@@ -654,8 +654,8 @@ def test_ems_data(proc_infra, test_user):
upload = run_processing(('test_ems_upload', 'tests/data/proc/examples_ems.zip'), test_user)
additional_keys = ['results.method.method_name', 'results.material.elements']
assert upload.total_entries_count == 2
assert len(upload.successful_entries) == 2
assert upload.total_entries_count == 1
assert len(upload.successful_entries) == 1
with upload.entries_metadata() as entries:
assert_upload_files(upload.upload_id, entries, StagingUploadFiles, published=False)
......
......@@ -52,9 +52,9 @@ def assert_search_upload(
index=config.elastic.entries_index, body=body)['hits']
if size != -1:
assert search_results['total'] == size
assert search_results['total']['value'] == size
if search_results['total'] > 0:
if search_results['total']['value'] > 0:
for hit in search_results['hits']:
hit = utils.flat(hit['_source'])
for key, value in kwargs.items():
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment