Merge pull request #151 from QuTech-Delft/release-0.7.1

Release 0.7.1
QuTech-Delft · May 27, 2024 · a3c7613 · a3c7613
2 parents 3525eff + 2a20b77
commit a3c7613
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 7 deletions.
diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
@@ -10,8 +10,8 @@ on:
 
 jobs:
   macos-x64:
-    name: PyPI wheels for macOS
-    runs-on: macos-latest
+    name: PyPI wheels for macOS/x64
+    runs-on: macos-13  # x64
     strategy:
       matrix:
         python:
@@ -29,6 +29,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip conan setuptools wheel
+          brew install swig
       - name: Build wheel
         env:
           QX_CPU_COMPATIBILITY_MODE: "True"
@@ -42,7 +43,53 @@ jobs:
           echo "WHEEL_NAME=$(ls *.whl)" >> $GITHUB_ENV
       - uses: actions/upload-artifact@v4
         with:
-          name: pypi-macos-py${{ matrix.python }}
+          name: pypi-macos-x64-py${{ matrix.python }}
+          path: pybuild/dist/${{ env.WHEEL_NAME }}
+      - uses: actions/upload-release-asset@v1
+        if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: pybuild/dist/${{ env.WHEEL_NAME }}
+          asset_name: ${{ env.WHEEL_NAME }}
+          asset_content_type: application/zip
+
+  macos-arm64:
+    name: PyPI wheels for macOS/arm64
+    runs-on: macos-14  # arm64
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip conan setuptools wheel
+          brew install swig
+      - name: Build wheel
+        env:
+          QX_CPU_COMPATIBILITY_MODE: "True"
+          NPROCS: 10
+        run: python setup.py bdist_wheel
+      - name: Wheel path
+        id: wheel
+        working-directory: pybuild/dist/
+        run: |
+          echo "WHEEL_NAME=$(ls *.whl)" >> $GITHUB_OUTPUT
+          echo "WHEEL_NAME=$(ls *.whl)" >> $GITHUB_ENV
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pypi-macos-arm64-py${{ matrix.python }}
           path: pybuild/dist/${{ env.WHEEL_NAME }}
       - uses: actions/upload-release-asset@v1
         if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
@@ -58,6 +105,8 @@ jobs:
     name: PyPI wheels for Manylinux (x64)
     runs-on: ubuntu-latest
     container: quay.io/pypa/manylinux${{ matrix.manylinux }}_x86_64:latest
+    env:
+      SWIG_VERSION: ${{ matrix.swig_version }}
     strategy:
       matrix:
         manylinux:
@@ -68,11 +117,15 @@ jobs:
           - "cp310-cp310"
           - "cp311-cp311"
           - "cp312-cp312"
+        include:
+          - manylinux: _2_28
+            swig_version: 'swig-3.0.12-19.module_el8.3.0+6167+838326ab'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install dependencies
         run: |
+          dnf install -y $SWIG_VERSION
           export PATH="/opt/python/${{ matrix.cpython_version }}/bin:$PATH"
           python -m pip install --upgrade pip conan wheel auditwheel
       - name: Build wheel
@@ -113,6 +166,7 @@ jobs:
     container: quay.io/pypa/manylinux${{ matrix.manylinux }}_aarch64:latest
     env:
       JAVA_VERSION: ${{ matrix.java_version }}
+      SWIG_VERSION: ${{ matrix.swig_version }}
     strategy:
       matrix:
         manylinux:
@@ -129,12 +183,13 @@ jobs:
         include:
           - manylinux: _2_28
             java_version: 'java-11-openjdk-11.0.21.0.9-2.el8'
+            swig_version: 'swig-3.0.12-19.module_el8.4.0+2254+838326ab'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install dependencies
         run: |
-          dnf install -y $JAVA_VERSION
+          dnf install -y $JAVA_VERSION $SWIG_VERSION
           export PATH="/opt/python/${{ matrix.cpython_version }}/bin:$PATH"
           python -m pip install --upgrade pip conan wheel auditwheel
       - name: Build wheel
@@ -219,6 +274,7 @@ jobs:
     if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
     needs:
       - macos-x64
+      - macos-arm64
       - manylinux-x64
       - manylinux-arm64
       - windows-x64

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [ 0.7.1 ] - [ 2024-05-22 ]
+
+### Added
+
+- Integrate with libqasm 0.6.6 release.
+- Allow multiple qubit/bit (register) definitions and mid-circuit measurements.
+
+### Changed
+
+- Update `conanfile.py` to request `libqasm/0.6.6` and use `tools.build.skip_test`.
+- Update GitHub workflows with some improvements taken from `libqasm`.
+
+### Removed
+
+
 ## [ 0.7.0 ] - [ 2024-04-17 ]
 
 ### Added

diff --git a/include/qx/Version.hpp b/include/qx/Version.hpp
@@ -1,4 +1,4 @@
 #ifndef QX_VERSION
-#define QX_VERSION "0.7.0"
+#define QX_VERSION "0.7.1"
 #define QX_RELEASE_YEAR "2024"
 #endif
diff --git a/setup.py b/setup.py
@@ -108,8 +108,8 @@ def run(self):
                 ['-b']['missing']
                 ['-tf']['']
             )
-            if not build_tests:
-                cmd = cmd['-c']['tools.build:skip_test=True']
+            if build_tests == "True":
+                cmd = cmd['-c']['tools.build:skip_test=False']
             if platform.system() == "Darwin":
                 cmd = cmd['-c']['tools.build:defines=["_LIBCPP_DISABLE_AVAILABILITY"]']
             cmd & FG