ProjectQ-Framework
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 7 additions & 51 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 7 additions & 51 deletions
diff --git a/‎.github/workflows/draft_release.yml‎
Lines changed: 10 additions & 11 deletions b/‎.github/workflows/draft_release.yml‎
Lines changed: 10 additions & 11 deletions
diff --git a/‎.github/workflows/format.yml‎
Lines changed: 15 additions & 3 deletions b/‎.github/workflows/format.yml‎
Lines changed: 15 additions & 3 deletions
diff --git a/‎.github/workflows/publish_release.yml‎
Lines changed: 63 additions & 16 deletions b/‎.github/workflows/publish_release.yml‎
Lines changed: 63 additions & 16 deletions
diff --git a/‎.github/workflows/pull_request.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/pull_request.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.pre-commit-config.yaml‎
Lines changed: 5 additions & 5 deletions b/‎.pre-commit-config.yaml‎
Lines changed: 5 additions & 5 deletions
@@ -20,6 +20,7 @@ jobs:
         - 3.7
         - 3.8
         - 3.9
+        - '3.10'
 
     name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 ${{ matrix.args }}"
     runs-on: ${{ matrix.runs-on }}
@@ -28,6 +29,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Get history and tags for SCM versioning to work
+      if: ${{ !env.ACT }}
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -125,6 +127,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Get history and tags for SCM versioning to work
+      if: ${{ !env.ACT }}
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -134,6 +137,7 @@ jobs:
         apt-get update && apt-get install -y python3-dev python3-pip python3-setuptools python3-wheel
         python3-numpy python3-scipy python3-matplotlib python3-requests python3-networkx
         python3-pytest python3-pytest-cov python3-flaky
+        libomp-dev
         --no-install-recommends
 
     - name: Prepare Python env
@@ -169,6 +173,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Get history and tags for SCM versioning to work
+      if: ${{ !env.ACT }}
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -236,6 +241,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Get history and tags for SCM versioning to work
+      if: ${{ !env.ACT }}
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -285,6 +291,7 @@ jobs:
         restore-keys: ${{ runner.os }}-doc-pip-
 
     - name: Get history and tags for SCM versioning to work
+      if: ${{ !env.ACT }}
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -300,54 +307,3 @@ jobs:
 
     - name: Make SDist
       run: python3 setup.py sdist
-
-
-  win32-msvc2017:
-    name: "🐍 ${{ matrix.python }} • MSVC 2017 • x64"
-    runs-on: windows-2016
-    strategy:
-      fail-fast: false
-      matrix:
-        python:
-          - 3.6
-          - 3.7
-          - 3.8
-          - 3.9
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Get history and tags for SCM versioning to work
-      run: |
-        git fetch --prune --unshallow
-        git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(python -m pip cache dir)"
-
-    - name: Cache wheels
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-${{ matrix.python }}-pip-${{ hashFiles('**/setup.cfg') }}
-        restore-keys: ${{ runner.os }}-${{ matrix.python }}-pip-
-
-    - name: Setup 🐍 ${{ matrix.python }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python }}
-
-    - name: Prepare env
-      run: |
-        python setup.py gen_reqfile --include-extras=test,braket
-        python -m pip install -r requirements.txt --prefer-binary
-
-    - name: Build and install package
-      run: python -m pip install -ve .[braket,test]
-
-    - name: Run all checks
-      run: |
-        echo 'backend: Agg' > matplotlibrc
-        python3 -m pytest -p no:warnings
@@ -3,10 +3,9 @@ name: "Draft new release"
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: 'Version to release'
+      tag:
+        description: 'Tag to prepare (format: vXX.YY.ZZ)'
         required: true
-
 jobs:
   new-release:
     name: "Draft a new release"
@@ -23,12 +22,12 @@ jobs:
         git flow init --default --tag v
 
     - name: Create release branch
-      run: git flow release start ${{ github.event.inputs.version }}
+      run: git flow release start ${{ github.event.inputs.tag }}
 
     - name: Update changelog
-      uses: thomaseizinger/keep-a-changelog-new-release@1.2.1
+      uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
       with:
-        version: ${{ github.event.inputs.version }}
+        version: ${{ github.event.inputs.tag }}
 
     - name: Initialize mandatory git config
       run: |
@@ -39,21 +38,21 @@ jobs:
       id: make-commit
       run: |
         git add CHANGELOG.md
-        git commit --message "Preparing release v${{ github.event.inputs.version }}"
+        git commit --message "Preparing release v${{ github.event.inputs.tag }}"
 
         echo "::set-output name=commit::$(git rev-parse HEAD)"
 
     - name: Push new branch
-      run: git flow release publish ${{ github.event.inputs.version }}
+      run: git flow release publish ${{ github.event.inputs.tag }}
 
     - name: Create pull request
-      uses: thomaseizinger/create-pull-request@1.1.0
+      uses: thomaseizinger/create-pull-request@1.2.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        head: release/${{ github.event.inputs.version }}
+        head: release/${{ github.event.inputs.tag }}
         base: master
-        title: Release version ${{ github.event.inputs.version }}
+        title: Release version ${{ github.event.inputs.tag }}
         reviewers: ${{ github.actor }}
         # Write a nice message to the user.
         # We are claiming things here based on the `publish-new-release.yml` workflow.
 
@@ -16,14 +16,26 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Get history and tags for SCM versioning to work
+      if: ${{ !env.ACT }}
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - uses: actions/setup-python@v2
-    - uses: pre-commit/[email protected]
+
+    - name: Install pre-commit
+      run: python3 -m pip install --upgrade pre-commit 'virtualenv!=20.11'
+
+    - name: Cache pre-commit hooks
+      uses: actions/cache@v2
       with:
-        # Slow hooks are marked with manual - slow is okay here, run them too
-        extra_args: --hook-stage manual --all-files
+        path: ~/.cache/pre-commit
+        key: pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}
+        restore-keys: pre-commit-
+
+    - name: Run pre-commit
+      run: |
+          # Slow hooks are marked with manual - slow is okay here, run them too
+          pre-commit run --hook-stage manual --all-files
 
   clang-tidy:
     name: Clang-Tidy
 
@@ -18,10 +18,18 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'pull_request' && github.event.pull_request.merged == true) || github.event_name == 'workflow_dispatch'
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
+        cibw_archs: ["auto64"]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        # include:
+        #   - os: ubuntu-18.04
+        #     cibw_archs: "aarch64"
     steps:
+      - name: Set up QEMU
+        if: matrix.cibw_archs == 'aarch64'
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
       - uses: actions/checkout@v2
         if: github.event_name != 'workflow_dispatch'
 
@@ -31,6 +39,7 @@ jobs:
           ref: 'master'
 
       - name: Get history and tags for SCM versioning to work
+        if: ${{ !env.ACT }}
         run: |
           git fetch --prune --unshallow
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -69,19 +78,56 @@ jobs:
 
       # ========================================================================
 
-      - name: Build source distribution
+      - uses: actions/setup-python@v2
+
+      - name: Install Python packages
+        run: python -m pip install -U --prefer-binary pip setuptools build wheel twine 'cibuildwheel<3,>=2'
+
+      - name: Build source distribution (Linux)
         if: runner.os == 'Linux'
-        run: python3 setup.py sdist -d wheelhouse
+        id: src-dist
+        run: |
+          python -m build --sdist
+          python -m twine check dist/*
+
+      - name: Build binary wheels
+        continue-on-error: true
+        id: binary-dist
+        run: |
+          python -m cibuildwheel --output-dir binary_dist
+          python -m twine check binary_dist/*
+        env:
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Check metadata
+      - name: Build binary wheels without (failing) testing
+        if: steps.binary-dist.outcome == 'failure'
+        id: failed-dist
         run: |
-          python3 -m pip install twine --prefer-binary
-          python3 -m twine check wheelhouse/*
+          python -m cibuildwheel --output-dir failed_dist
+        env:
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
+          CIBW_TEST_SKIP: '*'
+
+      - name: Files for Pypi upload
+        uses: actions/upload-artifact@v2
+        if: steps.src-dist.outcome == 'success'
+        with:
+          name: pypy_wheels
+          path: ./dist
 
-      - uses: actions/upload-artifact@v2
+      - name: Binary wheels
+        uses: actions/upload-artifact@v2
+        if: steps.binary-dist.outcome == 'success'
         with:
-          name: packages
-          path: ./wheelhouse/*
+          name: wheels
+          path: ./binary_dist
+
+      - name: Binary wheels that failed tests
+        uses: actions/upload-artifact@v2
+        if: steps.failed-dist.outcome == 'success'
+        with:
+          name: failed_wheels
+          path: ./failed_dist
 
 
   release:
@@ -134,7 +180,7 @@ jobs:
           ref: 'master'
 
       # ------------------------------------------------------------------------
-      # Downloads all to directories matching the artifact names
+
       - uses: actions/download-artifact@v2
 
       # Code below inspired from this action:
@@ -160,7 +206,9 @@ jobs:
           if [[ "${tag}" =~ ^v?[0-9\.]+-[a-zA-Z_0-9\.-]+(\+[a-zA-Z_0-9\.-]+)?$ ]]; then
             prerelease="--prerelease"
           fi
-          gh release create "v${RELEASE_VERSION}" ${prerelease:-} --title "ProjectQ v${RELEASE_VERSION}" --notes "${notes:-}" packages/*
+
+          mkdir -p wheels pypy_wheels
+          gh release create "v${RELEASE_VERSION}" ${prerelease:-} --title "ProjectQ v${RELEASE_VERSION}" --notes "${notes:-}" pypy_wheels/* wheels/*
 
 
   upload_to_pypi:
@@ -170,15 +218,14 @@ jobs:
     steps:
     - uses: actions/setup-python@v2
 
-    # Downloads all to directories matching the artifact names
     - uses: actions/download-artifact@v2
 
     - name: Publish standard package
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}
-        packages_dir: packages/
+        packages_dir: pypy_wheels/
 
   master_to_develop_pr:
     name: Merge master back into develop
@@ -188,7 +235,7 @@ jobs:
       - upload_to_pypi
     steps:
       - name: Merge master into develop branch
-        uses: thomaseizinger/create-pull-request@1.1.0
+        uses: thomaseizinger/create-pull-request@1.2.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
 
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - id: changelog-enforcer
-      uses: dangoslen/changelog-enforcer@v2
+      uses: dangoslen/changelog-enforcer@v3
       with:
         changeLogPath: 'CHANGELOG.md'
         skipLabels: 'Skip-Changelog'
@@ -23,7 +23,7 @@ repos:
       - id: check-useless-excludes
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -44,21 +44,21 @@ repos:
       - id: remove-tabs
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.9.1
+    rev: 5.10.1
     hooks:
       - id: isort
         name: isort (python)
 
   - repo: https://github.com/psf/black
-    rev: 21.5b1
+    rev: 21.12b0
     hooks:
       - id: black
         language_version: python3
         # This is a slow hook, so only run this if --hook-stage manual is passed
         stages: [manual]
 
   - repo: https://gitlab.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 4.0.1
     hooks:
       - id: flake8
         name: flake8-strict
@@ -82,7 +82,7 @@ repos:
         additional_dependencies: [pybind11>=2.6, numpy, requests, boto3, matplotlib, networkx, sympy]
 
   - repo: https://github.com/mgedmin/check-manifest
-    rev: '0.46'
+    rev: '0.47'
     hooks:
       - id: check-manifest
         additional_dependencies: ['setuptools-scm', 'pybind11>=2.6']