Merge branch 'develop' into drop_py37

AMICI-dev · Jan 12, 2022 · 93aa5f6 · 93aa5f6
2 parents ace85a6 + a4f6610
commit 93aa5f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -58,7 +58,7 @@ jobs:
       shell: bash
       run: pip install -v $(ls -t dist/amici-*.tar.gz | head -1)
 
-    - run: python -c "import amici"
+    - run: python -m amici
 
     - name: Run Python tests
       run: python -m pytest --ignore-glob=*petab* --ignore-glob=*special* python/tests
diff --git a/swig/amici.i b/swig/amici.i
@@ -194,14 +194,8 @@ import sys
 import os
 
 if sys.platform == 'win32':
-    def add_dll_directory(x):
-        if os.path.isdir(x):
-            print("Adding", x)
-            os.add_dll_directory(x)
-        else:
-            print("Skipping", x)
     for dll_dir in os.environ.get("AMICI_DLL_DIRS", "").split(os.pathsep):
-        add_dll_directory(dll_dir)
+        os.add_dll_directory(dll_dir)
 
 %}