From 4f5884b78bc931fedeca2d8a89d69e29ab33086a Mon Sep 17 00:00:00 2001
From: sanbrock <sandor.brockhauser@gmail.com>
Date: Thu, 16 Dec 2021 00:04:11 +0100
Subject: [PATCH] Not to stip shared objects to check if h5py works now
Not to stip shared objects to check if h5py works now
Not to stip h5py shared objects
nexus parser with definiotions in a fork
nexusparser: updated setup.py
add nexusparser package data files also into nomad's MANIFEST.in
recursive flag for git submodule is also needed at Install tests
---
.gitlab-ci.yml | 4 ++--
Dockerfile | 2 +-
MANIFEST.in | 6 +++++-
dependencies/parsers/nexus | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb2f997943..b6ea695171 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 6254756f97..b0a6b76309 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 c1d53f41fa..d657f4cfa2 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 97b8c633d5..043bd5f309 160000
--- a/dependencies/parsers/nexus
+++ b/dependencies/parsers/nexus
@@ -1 +1 @@
-Subproject commit 97b8c633d5b7cfe345fd9e5a01a782b7ed7159d4
+Subproject commit 043bd5f309c83e28c9e1cd03fa3e88d78f2f13ba
--
GitLab