Skip to content

Commit 1e8082c

Browse files
committed
Removed more old parsers.
1 parent 71af370 commit 1e8082c

File tree

7 files changed

+3
-27
lines changed

7 files changed

+3
-27
lines changed

.gitmodules

-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
[submodule "dependencies/parsers/mpes"]
2-
path = dependencies/parsers/mpes
3-
url = https://github.com/nomad-coe/nomad-parser-mpes.git
4-
branch = master
5-
[submodule "dependencies/parsers/aptfim"]
6-
path = dependencies/parsers/aptfim
7-
url = https://github.com/nomad-coe/nomad-parser-aptfim.git
8-
branch = master
91
[submodule "dependencies/materia"]
102
path = gui/materia
113
url = https://github.com/nomad-coe/materia
@@ -19,9 +11,6 @@
1911
[submodule "dependencies/parsers/example"]
2012
path = dependencies/parsers/example
2113
url = https://github.com/nomad-coe/nomad-parser-example.git
22-
[submodule "dependencies/parsers/xps"]
23-
path = dependencies/parsers/xps
24-
url = https://github.com/nomad-coe/nomad-parser-xps.git
2514
[submodule "dependencies/nomad-remote-tools-hub"]
2615
path = dependencies/nomad-remote-tools-hub
2716
url = https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-remote-tools-hub.git

dependencies/parsers/aptfim

-1
This file was deleted.

dependencies/parsers/mpes

-1
This file was deleted.

dependencies/parsers/xps

-1
This file was deleted.

nomad/parsing/parsers.py

-7
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,8 @@
2525
from .parser import MissingParser, BrokenParser, Parser, ArchiveParser, MatchingParserInterface
2626
from .artificial import EmptyParser, GenerateRandomParser, TemplateParser, ChaosParser
2727

28-
from xpsparser import XPSParser
2928
from eelsdbparser import EELSDBParser
3029
from nexusparser import NexusParser
31-
# TODO
32-
# from mpesparser import MPESParser
33-
# from aptfimparser import APTFIMParser
3430

3531
try:
3632
# these packages are not available without parsing extra, which is ok, if the
@@ -490,10 +486,7 @@ def match_parser(mainfile_path: str, strict=True) -> Parser:
490486
name='parsers/phonopy', code_name='Phonopy', code_homepage='https://phonopy.github.io/phonopy/',
491487
mainfile_name_re=(r'(.*/phonopy-FHI-aims-displacement-0*1/control.in$)|(.*/phon.+yaml)')
492488
),
493-
# MPESParser(),
494-
# APTFIMParser(),
495489
EELSDBParser(),
496-
XPSParser(),
497490
NexusParser(),
498491
ArchiveParser()
499492
]

tests/parsing/test_parsing.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,12 @@
7070
('parsers/qbox', 'tests/data/parsers/qbox/01_h2ogs.r'),
7171
('parser/onetep', 'tests/data/parsers/onetep/fluor/12-difluoroethane.out'),
7272
('parsers/eels', 'tests/data/parsers/eels.json'),
73-
('parsers/xps', 'tests/data/parsers/xps/multiple_channels.xy'),
7473
('parsers/lobster', 'tests/data/parsers/lobster/NaCl/lobsterout'),
7574
('parsers/aflow', 'tests/data/parsers/aflow/Ag1Co1O2_ICSD_246157/aflowlib.json'),
7675
('parsers/mp', 'tests/data/parsers/mp/mp-1/materials.json'),
7776
('parsers/asr', 'tests/data/parsers/asr/archive_ccdc26c4f32546c5a00ad03a093b73dc.json'),
7877
('parsers/psi4', 'tests/data/parsers/psi4/adc1/output.ref'),
7978
('parsers/yambo', 'tests/data/parsers/yambo/hBN/r-10b_1Ry_HF_and_locXC_gw0_em1d_ppa'),
80-
# ('parsers/aptfim', 'tests/data/parsers/aptfim.aptfim'),
81-
# ('parsers/mpes', 'tests/data/parsers/mpes.meta'),
8279
('parsers/archive', 'tests/data/parsers/archive.json')
8380
]
8481

@@ -90,7 +87,7 @@
9087
fixed_parser_examples.append((parser, mainfile))
9188
parser_examples = fixed_parser_examples
9289

93-
correct_num_output_files = 123
90+
correct_num_output_files = 122
9491

9592

9693
def create_reference(data, pretty):

tests/processing/test_data.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,8 @@ def test_ems_data(proc_infra, test_user):
655655
upload = run_processing(('test_ems_upload', 'tests/data/proc/examples_ems.zip'), test_user)
656656

657657
additional_keys = ['results.method.method_name', 'results.material.elements']
658-
assert upload.total_entries_count == 2
659-
assert len(upload.successful_entries) == 2
658+
assert upload.total_entries_count == 1
659+
assert len(upload.successful_entries) == 1
660660

661661
with upload.entries_metadata() as entries:
662662
assert_upload_files(upload.upload_id, entries, StagingUploadFiles, published=False)

0 commit comments

Comments
 (0)