Merge branch 'main' into tomaszkumor/test

software-mansion-labs · Feb 13, 2024 · 7957c1a · 7957c1a
2 parents 91e8c0e + 1088ea4
commit 7957c1a
Show file tree

Hide file tree

Showing 6 changed files with 224 additions and 249 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "ubuntu-latest", "macos-11", "macos-12", "windows-latest" ]
+        os: [ "ubuntu-latest", "macos-12", macos-13, macos-14, "windows-latest" ]
         python-version: [ "3.11" ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -31,23 +31,27 @@ jobs:
           platforms: all
 
       - name: Install cibuildwheel
-        run: python -X utf8 -m pip install cibuildwheel==2.12.0
-
-      - name: Set macos-11 deployment target
-        if: matrix.os == 'macos-11'
-        run: echo "MACOSX_DEPLOYMENT_TARGET=11.0" >> $GITHUB_ENV
+        run: python -X utf8 -m pip install cibuildwheel==2.16.5
 
       - name: Set macos-12 deployment target
         if: matrix.os == 'macos-12'
         run: echo "MACOSX_DEPLOYMENT_TARGET=12.0" >> $GITHUB_ENV
 
+      - name: Set macos-13 deployment target
+        if: matrix.os == 'macos-13'
+        run: echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV
+
+      - name: Set macos-14 deployment target
+        if: matrix.os == 'macos-14'
+        run: echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV
+
       - name: Build wheels
         run: python -X utf8 -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ARCHS: all
           CIBW_BUILD_FRONTEND: "build"
-          CIBW_BUILD: cp38-* cp39-* cp310-* cp311-*
-          CIBW_SKIP: '*i686 cp39-win_arm64 cp310-win_arm64 cp311-win_arm64'
+          CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
+          CIBW_SKIP: '*i686 cp39-win_arm64 cp310-win_arm64 cp311-win_arm64 cp312-win_arm64'
           CIBW_ARCHS_MACOS: "universal2"
           CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"
 

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -15,12 +15,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "ubuntu-latest", "macos-11", "macos-12", "windows-latest" ]
+        os: [ "ubuntu-latest", "macos-12", "macos-13", "macos-14", "windows-latest" ]
         python-version: [ "3.12" ]
     defaults:
       run:
         shell: bash
     runs-on: ${{ matrix.os }}
+
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -49,6 +50,4 @@ jobs:
       - name: Run tests
         run: |
           poetry run pytest tests/c_bindings_test.py
-      - name: Run tests
-        run: |
           poetry run pytest tests/poseidon_hash_test.py
diff --git a/README.rst b/README.rst
@@ -12,6 +12,11 @@ They can be found in *poseidon_params.txt*.
 Changelog
 =========
 
+Version 0.1.4 (2024-02-12)
+--------------------------
+
+* Add support for Windows (Python 3.12)
+
 Version 0.1.3 (2023-04-27)
 --------------------------