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

Removed more old parsers.

parent 718cadf5
Pipeline #126751 passed with stages
in 31 minutes and 30 seconds
[submodule "dependencies/parsers/mpes"]
path = dependencies/parsers/mpes
url = https://github.com/nomad-coe/nomad-parser-mpes.git
branch = master
[submodule "dependencies/parsers/aptfim"]
path = dependencies/parsers/aptfim
url = https://github.com/nomad-coe/nomad-parser-aptfim.git
branch = master
[submodule "dependencies/materia"]
path = gui/materia
url = https://github.com/nomad-coe/materia
......@@ -19,9 +11,6 @@
[submodule "dependencies/parsers/example"]
path = dependencies/parsers/example
url = https://github.com/nomad-coe/nomad-parser-example.git
[submodule "dependencies/parsers/xps"]
path = dependencies/parsers/xps
url = https://github.com/nomad-coe/nomad-parser-xps.git
[submodule "dependencies/parsers/electronic"]
path = dependencies/parsers/electronic
url = https://github.com/nomad-coe/electronic-parsers.git
......
Subproject commit 51b0ccd3656355b1c33687d910ed9f982c9e297c
Subproject commit 09c9fbf47391814bbe95d76b7468f86eb8c361fb
Subproject commit 2d607abb021f7c19c5b1e2b1896c2b29ed68ea87
......@@ -25,11 +25,8 @@ from nomad.datamodel import results
from .parser import MissingParser, BrokenParser, Parser, ArchiveParser, MatchingParserInterface
from .artificial import EmptyParser, GenerateRandomParser, TemplateParser, ChaosParser
from xpsparser import XPSParser
from eelsdbparser import EELSDBParser
# TODO
# from mpesparser import MPESParser
# from aptfimparser import APTFIMParser
try:
# these packages are not available without parsing extra, which is ok, if the
......@@ -489,10 +486,7 @@ parsers = [
name='parsers/phonopy', code_name='Phonopy', code_homepage='https://phonopy.github.io/phonopy/',
mainfile_name_re=(r'(.*/phonopy-FHI-aims-displacement-0*1/control.in$)|(.*/phon.+yaml)')
),
# MPESParser(),
# APTFIMParser(),
EELSDBParser(),
XPSParser(),
ArchiveParser()
]
......
......@@ -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)
......
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