Resurrect CI

tschoonj · Dec 25, 2023 · fb80113 · fb80113
1 parent c05c4c0
commit fb80113
Show file tree

Hide file tree

Showing 15 changed files with 369 additions and 362 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/example/Makefile.am b/example/Makefile.am
@@ -100,7 +100,7 @@ xrlexample2.sh: ../perl/xraylib.la xrlexample2.pl
 #test the python bindings
 xrlexample5.sh: ../python/_xraylib.la xrlexample5.py
 	@echo "Testing python bindings"
-	@echo "LD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" DYLD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" PATH=\"${top_builddir}/src/.libs\" PYTHONPATH=\"${top_builddir}/python:${top_builddir}/python/.libs\" $(PYTHON) ${top_srcdir}/example/xrlexample5.py" > xrlexample5.sh
+	@echo "EXTRA_DLL_SEARCH_PATHS=\"${top_builddir}/src/.libs\" LD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" DYLD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" PATH=\"${top_builddir}/src/.libs\" PYTHONPATH=\"${top_builddir}/python:${top_builddir}/python/.libs\" $(PYTHON) ${top_srcdir}/example/xrlexample5.py" > xrlexample5.sh
 	@chmod +x xrlexample5.sh
 
 #test the java bindings
@@ -134,10 +134,9 @@ xrlexample12.sh: ../php/xraylib.la xrlexample12.php
 #test the numpy-python bindings
 xrlexample13.sh: ../python/xraylib_np.la xrlexample13.py
 	@echo "Testing python-numpy bindings"
-	@echo "LD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" DYLD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" PATH=\"${top_builddir}/src/.libs\" PYTHONPATH=\"${top_builddir}/python:${top_builddir}/python/.libs\" $(PYTHON) ${top_srcdir}/example/xrlexample13.py" > xrlexample13.sh
+	@echo "EXTRA_DLL_SEARCH_PATHS=\"${top_builddir}/src/.libs\" LD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" DYLD_LIBRARY_PATH=\"${top_builddir}/src/.libs\" PATH=\"${top_builddir}/src/.libs\" PYTHONPATH=\"${top_builddir}/python:${top_builddir}/python/.libs\" $(PYTHON) ${top_srcdir}/example/xrlexample13.py" > xrlexample13.sh
 	@chmod +x xrlexample13.sh
 
-
 #testing the Pascal-Delphi bindings
 xrlexample14.sh: ../pascal/xraylib.ppu xrlexample14.pas
 	@echo "Testing Pascal bindings"

diff --git a/example/xrlexample13.py b/example/xrlexample13.py
@@ -13,7 +13,11 @@
 import numpy as np
 import xraylib_np as xrl_np
 import sys 
+import os
 
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 
 
 if __name__ == '__main__' :

diff --git a/example/xrlexample5.py b/example/xrlexample5.py
@@ -12,7 +12,10 @@
 
 """Example of using various xraylib functionality in python."""
 
-
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import xraylib
 import math
 import numpy as np

diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
@@ -3,7 +3,7 @@ NULL=
 TEST_EXTENSIONS = .py
 PY_LOG_COMPILER = $(PYTHON)
 AM_PY_LOG_FLAGS =
-AM_TESTS_ENVIRONMENT = LD_LIBRARY_PATH='${top_builddir}/src/.libs' DYLD_LIBRARY_PATH='${top_builddir}/src/.libs' PATH='${top_builddir}/src/.libs' PYTHONPATH='${top_builddir}/python:${top_builddir}/python/.libs' ; export LD_LIBRARY_PATH DYLD_LIBRARY_PATH PATH PYTHONPATH ;
+AM_TESTS_ENVIRONMENT = EXTRA_DLL_SEARCH_PATHS='${top_builddir}/src/.libs' LD_LIBRARY_PATH='${top_builddir}/src/.libs' DYLD_LIBRARY_PATH='${top_builddir}/src/.libs' PATH='${top_builddir}/src/.libs' PYTHONPATH='${top_builddir}/python:${top_builddir}/python/.libs' ; export LD_LIBRARY_PATH DYLD_LIBRARY_PATH PATH PYTHONPATH ;
 
 if ENABLE_PYTHON
 dist_check_SCRIPTS = \

diff --git a/python/tests/meson.build b/python/tests/meson.build
@@ -14,8 +14,9 @@ test_env = environment()
 test_env.prepend('PYTHONPATH', pydir)
 if host_system == 'windows'
     test_env.prepend('PATH', src_build_dir)
-    # see https://github.com/xhochy/python-feedstock/blob/6efc12d0479e958a138bfaf3d1eb6b47a10d5f68/recipe/patches/0014-Add-CondaEcosystemModifyDllSearchPath.patch
-    test_env.prepend('CONDA_DLL_SEARCH_MODIFICATION_ENABLE', '1')
+    # # see https://github.com/xhochy/python-feedstock/blob/6efc12d0479e958a138bfaf3d1eb6b47a10d5f68/recipe/patches/0014-Add-CondaEcosystemModifyDllSearchPath.patch
+    # test_env.prepend('CONDA_DLL_SEARCH_MODIFICATION_ENABLE', '1')
+    test_env.append('EXTRA_DLL_SEARCH_PATHS', src_build_dir)
 endif
 
 foreach _test : tests

diff --git a/python/tests/test-atomiclevelwidth.py b/python/tests/test-atomiclevelwidth.py
@@ -1,6 +1,11 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 
+
 class TestAtomicLevelWidth(unittest.TestCase):
     def test_Fe_K(self):
         width = xraylib.AtomicLevelWidth(26, xraylib.K_SHELL)

diff --git a/python/tests/test-atomicweight.py b/python/tests/test-atomicweight.py
@@ -1,6 +1,11 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 
+
 class TestAtomicWeight(unittest.TestCase):
     def test_Fe(self):
         weight = xraylib.AtomicWeight(26)

diff --git a/python/tests/test-auger.py b/python/tests/test-auger.py
@@ -1,6 +1,11 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 
+
 class TestAugerRate(unittest.TestCase):
     def test_Pb_K_L3M5(self):
         rate = xraylib.AugerRate(82, xraylib.K_L3M5_AUGER)

diff --git a/python/tests/test-compoundparser.py b/python/tests/test-compoundparser.py
@@ -1,6 +1,11 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 
+
 class TestCompoundParser(unittest.TestCase):
     def test_good_compounds(self):
         self.assertIsInstance(xraylib.CompoundParser("C19H29COOH"), dict)

diff --git a/python/tests/test-comptonprofiles.py b/python/tests/test-comptonprofiles.py
@@ -1,6 +1,11 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 
+
 class TestComptonProfiles(unittest.TestCase):
     def test_pz_0(self):
         profile = xraylib.ComptonProfile(26, 0.0)

diff --git a/python/tests/test-crystal_diffraction.py b/python/tests/test-crystal_diffraction.py
@@ -1,7 +1,12 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 import math
 
+
 class TestCrystalDiffraction(unittest.TestCase):
     def test_crystal_diffraction(self):
         crystals_list = xraylib.Crystal_GetCrystalsList()

diff --git a/python/tests/test-nist-compounds.py b/python/tests/test-nist-compounds.py
@@ -1,6 +1,11 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 
+
 class TestNISTCompounds(unittest.TestCase):
     def test_good(self):
         list = xraylib.GetCompoundDataNISTList()

diff --git a/python/tests/test-numpy.py b/python/tests/test-numpy.py
@@ -1,7 +1,13 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 import numpy as np
 
+
+
 class TestNumpy(unittest.TestCase):
     def _test_np(self, dtype):
         for Z in np.arange(10, 20, dtype=dtype):

diff --git a/python/tests/test-radionuclides.py b/python/tests/test-radionuclides.py
@@ -1,6 +1,11 @@
+import os
+if "EXTRA_DLL_SEARCH_PATHS" in os.environ and hasattr(os, "add_dll_directory"):
+    for path in os.environ["EXTRA_DLL_SEARCH_PATHS"].split(os.pathsep):
+        os.add_dll_directory(path)
 import unittest
 import xraylib
 
+
 class TestRadionuclides(unittest.TestCase):
     def test_good(self):
         list = xraylib.GetRadioNuclideDataList()