try windows CI again

mRcSchwering · Dec 8, 2023 · ed3f930 · ed3f930
1 parent 05f8ec2
commit ed3f930
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 56 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+        target: [x86_64, x86, aarch64]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -46,53 +46,37 @@ jobs:
           pip install -r python/requirements.txt
           pip install pytest
           pytest tests/fast
-      # - name: pytest
-      #   if: ${{ !startsWith(matrix.target, 'x86') && matrix.target != 'ppc64' }}
-      #   uses: uraimo/run-on-arch-action@v2.5.0
-      #   with:
-      #     arch: ${{ matrix.target }}
-      #     distro: ubuntu22.04
-      #     githubToken: ${{ github.token }}
-      #     install: |
-      #       apt-get update
-      #       apt-get install -y --no-install-recommends python3 python3-pip
-      #       pip3 install -U pip pytest
-      #     run: |
-      #       set -e
-      #       pip3 install magicsoup --find-links dist --force-reinstall
-      #       pytest
 
-  # TODO: fix windows builds
-  # windows:
-  #   runs-on: windows-latest
-  #   strategy:
-  #     matrix:
-  #       target: [x64, x86]
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-python@v4
-  #       with:
-  #         python-version: '3.10'
-  #         architecture: ${{ matrix.target }}
-  #     - name: Build wheels
-  #       uses: PyO3/maturin-action@v1
-  #       with:
-  #         target: ${{ matrix.target }}
-  #         args: --release --out dist --find-interpreter
-  #         sccache: 'true'
-  #     - name: Upload wheels
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: wheels
-  #         path: dist
-  #     - name: pytest
-  #       if: ${{ !startsWith(matrix.target, 'aarch64') }}
-  #       shell: bash
-  #       run: |
-  #         set -e
-  #         pip install magicsoup --find-links dist --force-reinstall
-  #         pip install pytest
-  #         pytest
+  windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        target: [x64, x86]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+          architecture: ${{ matrix.target }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist
+      - name: pytest
+        if: ${{ startsWith(matrix.target, 'x86') }}
+        shell: bash
+        run: |
+          set -e
+          pip install magicsoup --find-links dist --force-reinstall
+          pip install pytest
+          pytest tests/fast
 
   macos:
     runs-on: macos-latest
@@ -121,12 +105,8 @@ jobs:
         run: |
           set -e
           pip install magicsoup --find-links dist --force-reinstall
-        # TODO: fix tests
-        # run: |
-        #   set -e
-        #   pip install magicsoup --find-links dist --force-reinstall
-        #   pip install pytest
-        #   pytest
+          pip install pytest
+          pytest tests/fast
 
   sdist:
     runs-on: ubuntu-latest
@@ -146,7 +126,7 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: [linux, macos, sdist]
+    needs: [linux, windows, macos, sdist]
     steps:
       - uses: actions/download-artifact@v3
         with:

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,3 +1,3 @@
 # necessary to run package
-numpy>=1.24.0,<1.25.0
-torch>=2.0.0,<2.1.0
+numpy>=1.24.0,<1.27.0
+torch>=2.0.0,<2.2.0