diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb2f99794378fde1426de5227027cdd67694c59b..b6ea6951719d89ba1d12a27a98faf4acd30222ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,9 +136,9 @@ install tests: stage: test image: python:3.7 before_script: - - git submodule sync + - git submodule sync --recursive - sleep 5 - - git submodule update --init --jobs=4 + - git submodule update --init --recursive --jobs=4 script: - pip install --upgrade pip - pip install fastentrypoints diff --git a/Dockerfile b/Dockerfile index 6254756f9713802c2bc18b5ac7ebc71ed5557348..b0a6b76309632e73c1f284bd68835aee3aec015f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ RUN make html RUN \ find /usr/local/lib/python3.7/ -name 'tests' ! -path '*/networkx/*' -exec rm -r '{}' + && \ find /usr/local/lib/python3.7/ -name 'test' -exec rm -r '{}' + && \ - find /usr/local/lib/python3.7/site-packages/ -name '*.so' -print -exec sh -c 'file "{}" | grep -q "not stripped" && strip -s "{}"' \; + find /usr/local/lib/python3.7/site-packages/ -name '*.so' -print -exec sh -c 'file "{}" | grep -q "not stripped" | grep -v h5py && strip -s "{}"' \; # Built the GUI in the gui build image FROM node:14.8 as gui_build diff --git a/MANIFEST.in b/MANIFEST.in index c1d53f41fa7732b912d85974d8ef6ad543f8518d..d657f4cfa2b3a260543ef22d8e6edc168338b557 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,4 +6,8 @@ include LICENSE.txt include requirements.txt include auto_complete_install.sh include setup.json -recursive-include nomad/app/static *.css *.ico *.html *.json *.js *.map *.txt *.svg *.png \ No newline at end of file +recursive-include nomad/app/static *.css *.ico *.html *.json *.js *.map *.txt *.svg *.png +recursive-include dependencies/parsers/nexus/nexusparser/definitions/base_classes/ *.xml +recursive-include dependencies/parsers/nexus/nexusparser/definitions/applications/ *.xml +recursive-include dependencies/parsers/nexus/nexusparser/definitions/contributed_definitions/ *.xml +include dependencies/parsers/nexus/nexusparser/definitions/ *.xsd diff --git a/dependencies/parsers/nexus b/dependencies/parsers/nexus index 97b8c633d5b7cfe345fd9e5a01a782b7ed7159d4..043bd5f309c83e28c9e1cd03fa3e88d78f2f13ba 160000 --- a/dependencies/parsers/nexus +++ b/dependencies/parsers/nexus @@ -1 +1 @@ -Subproject commit 97b8c633d5b7cfe345fd9e5a01a782b7ed7159d4 +Subproject commit 043bd5f309c83e28c9e1cd03fa3e88d78f2f13ba