From eadab95eeec6a5e09b12b5fbe26b18900bc9fad4 Mon Sep 17 00:00:00 2001
From: Steffen Hauf <haufs@max-exfl015.desy.de>
Date: Fri, 22 Jun 2018 14:32:24 +0200
Subject: [PATCH] Properly install package data
---
setup.py | 21 ++++++++++++++++++---
xfel_calibrate/bin | 1 +
xfel_calibrate/calibrate.py | 6 +++---
xfel_calibrate/notebooks | 1 +
4 files changed, 23 insertions(+), 6 deletions(-)
create mode 120000 xfel_calibrate/bin
create mode 120000 xfel_calibrate/notebooks
diff --git a/setup.py b/setup.py
index 3e7a058f7..0fd45e478 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+import glob
from setuptools import setup
from setuptools.command.install import install
from subprocess import check_call
@@ -7,6 +8,7 @@ import sys
class PostInstallCommand(install):
"""Post-installation for installation mode."""
def run(self):
+ install.run(self)
# check if this is a karabo installation
python_path = sys.executable
if "karabo" in python_path:
@@ -21,16 +23,29 @@ class PostInstallCommand(install):
else:
print("Python environment seems to not be a Karabo environment. "+
"Please install PyDetLib manually.")
+
+
+
+
+from xfel_calibrate.notebooks import notebooks
+data_files = []
+for ctypes in notebooks.values():
+ for nb in ctypes.values():
+ data_files.append(nb["notebook"])
setup(
name='European XFEL Offline Calibration',
version="1.0",
packages=['cal_tools', 'xfel_calibrate'],
package_dir={'cal_tools': 'cal_tools',
- 'xfel_calibrate': './'},
- package_data={'xfel_calibrate/notebooks': 'notebooks',
- 'xfel_calibrate/bin': 'bin'},
+ 'xfel_calibrate': 'xfel_calibrate',
+ 'xfel_calibrate.notebooks': 'xfel_calibrate/notebooks',
+ },
+ package_data={
+ 'xfel_calibrate': ['bin/*.sh']+data_files
+ },
+
cmdclass={
'install': PostInstallCommand,
},
diff --git a/xfel_calibrate/bin b/xfel_calibrate/bin
new file mode 120000
index 000000000..19f285ac7
--- /dev/null
+++ b/xfel_calibrate/bin
@@ -0,0 +1 @@
+../bin
\ No newline at end of file
diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index 40c2e276c..baa4cdff5 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -161,7 +161,7 @@ if len(sys.argv) == 3 and "-h" in sys.argv[2]:
# The information is extracted from the first markdown cell of
# the notebook.
for caltype, notebook in det_notebooks.items():
- nbpath = os.path.abspath("{}/../../{}".format(__file__, notebook["notebook"]))
+ nbpath = os.path.abspath("{}/{}".format(os.path.dirname(__file__), notebook["notebook"]))
with open(nbpath, "r") as f:
nb = nbformat.read(f, as_version=4)
msg += make_epilog(nb, caltype=caltype)
@@ -177,7 +177,7 @@ elif len(sys.argv) >= 3:
detector = sys.argv[1].upper()
caltype = sys.argv[2].upper()
try:
- notebook = os.path.abspath("{}/../../{}".format(__file__, notebooks[detector][caltype]["notebook"]))
+ notebook = os.path.abspath("{}/{}".format(os.path.dirname(__file__), notebooks[detector][caltype]["notebook"]))
cvar = notebooks[detector][caltype].get("concurrency",
{"parameter": None,
"default concurrency": None,
@@ -272,7 +272,7 @@ def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None,
srun_base = []
- srun_base += [os.path.abspath("{}/../../bin/slurm_calibrate.sh".format(os.path.realpath(__file__))), # path to helper sh
+ srun_base += [os.path.abspath("{}/bin/slurm_calibrate.sh".format(os.path.dirname(__file__))), # path to helper sh
os.path.abspath(nbpath), # path to notebook
python_path, # path to python
ipython_path, # path to ipython
diff --git a/xfel_calibrate/notebooks b/xfel_calibrate/notebooks
new file mode 120000
index 000000000..8f9a5b2e6
--- /dev/null
+++ b/xfel_calibrate/notebooks
@@ -0,0 +1 @@
+../notebooks
\ No newline at end of file
--
GitLab