Run CI on windows

metatensor · Jul 26, 2023 · fd9c5c8 · fd9c5c8
1 parent b97bcec
commit fd9c5c8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -19,13 +19,12 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            rust-target: x86_64-unknown-linux-gnu
             python-version: "3.7"
           - os: ubuntu-20.04
-            rust-target: x86_64-unknown-linux-gnu
             python-version: "3.11"
           - os: macos-11
-            rust-target: x86_64-apple-darwin
+            python-version: "3.11"
+          - os: windows-2019
             python-version: "3.11"
     steps:
       - uses: actions/checkout@v3
@@ -39,13 +38,12 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          target: ${{ matrix.rust-target }}
 
       - name: install python dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install tox
-          echo "tox_version=$(tox --version | awk '{split($0, s," "); print s[1]}')" >> $GITHUB_ENV
+          echo "tox_version=$(python -c 'import tox; print(tox.__version__)')" >> $GITHUB_ENV
 
       - name: Setup sccache
         uses: mozilla-actions/[email protected]
@@ -92,7 +90,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install tox
-          echo "tox_version=$(tox --version | awk '{split($0, s," "); print s[1]}')" >> $GITHUB_ENV
+          echo "tox_version=$(python -c 'import tox; print(tox.__version__)')" >> $GITHUB_ENV
 
       - name: cache tox environments
         uses: actions/cache@v3

diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml
@@ -24,24 +24,32 @@ jobs:
             build-type: debug
             test-static-lib: true
             extra-name: / static C library
+
           - os: ubuntu-20.04
             rust-version: stable
             rust-target: x86_64-unknown-linux-gnu
             build-type: release
             cargo-build-flags: --release
             do-valgrind: true
             extra-name: / release valgrind
+
           # check the build on a stock Ubuntu 20.04, including cmake 3.16
           - os: ubuntu-20.04
             rust-version: "1.63"
             container: ubuntu:20.04
             rust-target: x86_64-unknown-linux-gnu
             build-type: debug
             extra-name: / cmake 3.16
+
           - os: macos-11
             rust-version: stable
             rust-target: x86_64-apple-darwin
             build-type: debug
+
+          - os: windows-2019
+            rust-version: stable
+            rust-target: x86_64-pc-windows-msvc
+            build-type: debug
     steps:
       - name: install dependencies in container
         if: matrix.container == 'ubuntu:20.04'

diff --git a/python/rascaline/rascaline/_c_lib.py b/python/rascaline/rascaline/_c_lib.py
@@ -32,17 +32,16 @@ def __call__(self):
 def _lib_path():
     if sys.platform.startswith("darwin"):
         windows = False
-        name = "librascaline.dylib"
+        path = os.path.join(_HERE, "lib", "librascaline.dylib")
     elif sys.platform.startswith("linux"):
         windows = False
-        name = "librascaline.so"
+        path = os.path.join(_HERE, "lib", "librascaline.so")
     elif sys.platform.startswith("win"):
         windows = True
-        name = "rascaline.dll"
+        path = os.path.join(_HERE, "bin", "rascaline.dll")
     else:
         raise ImportError("Unknown platform. Please edit this file")
 
-    path = os.path.join(os.path.join(_HERE, "lib"), name)
     if os.path.isfile(path):
         if windows:
             _check_dll(path)