-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1197 from CQCL/release/1.23.0
Release/1.23.0
- Loading branch information
Showing
88 changed files
with
2,310 additions
and
2,746 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Description | ||
|
|
||
| Please summarise the changes. | ||
|
|
||
| # Related issues | ||
|
|
||
| Please mention any github issues addressed by this PR. | ||
|
|
||
| # Checklist | ||
|
|
||
| - [ ] I have performed a self-review of my code. | ||
| - [ ] I have commented hard-to-understand parts of my code. | ||
| - [ ] I have made corresponding changes to the public API documentation. | ||
| - [ ] I have added tests that prove my fix is effective or that my feature works. | ||
| - [ ] I have updated the changelog with any user-facing changes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ jobs: | |
| tket_package_exists: ${{ steps.tket_package_exists.outputs.tket_package_exists }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-python@v4 | ||
| - uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.11' | ||
| - uses: dorny/[email protected] | ||
|
|
@@ -106,7 +106,7 @@ jobs: | |
| run: sudo apt update | ||
| - name: Select Python 3.10 | ||
| # otherwise turtlebrowser/[email protected] fails on macos-12 | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.10' | ||
| - name: Install conan | ||
|
|
@@ -260,17 +260,17 @@ jobs: | |
| conan create recipes/pybind11_json/all --version 0.2.13 | ||
| - name: Set up Python (pull request) | ||
| if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.9" | ||
| - name: Set up Python (push) | ||
| if: github.event_name == 'push' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.10" | ||
| - name: Set up Python (schedule) | ||
| if: github.event_name == 'schedule' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.11" | ||
| - name: Build pytket | ||
|
|
@@ -302,13 +302,13 @@ jobs: | |
| ./.github/workflows/build-docs | ||
| - name: Upload artefact | ||
| if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: pytket_docs | ||
| path: pytket/docs/build/html/ | ||
| - name: Upload pytket coverage artefact | ||
| if: github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: pytket_test_coverage | ||
| path: pytket/tests/htmlcov | ||
|
|
@@ -330,7 +330,7 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| - name: Select Python 3.10 | ||
| # otherwise turtlebrowser/[email protected] fails on macos-12 | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.10' | ||
| - name: Install conan | ||
|
|
@@ -370,12 +370,12 @@ jobs: | |
| run: brew install [email protected] | ||
| - name: Set up Python (push) | ||
| if: github.event_name == 'push' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.10" | ||
| - name: Set up Python (schedule) | ||
| if: github.event_name == 'schedule' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.11" | ||
| - name: Build pytket | ||
|
|
@@ -459,17 +459,19 @@ jobs: | |
| key: tket-dynamic-visual-studio-windows-2022-${{ steps.current_time.outputs.formattedTime }} | ||
| restore-keys: | | ||
| tket-dynamic-visual-studio-windows-2022 | ||
| - name: get ccache version | ||
| id: ccache-ver | ||
| - name: get ccache path | ||
| id: ccache-path | ||
| shell: bash | ||
| run: | | ||
| ccache_ver=$(choco list -e ccache | grep "ccache" | grep -ioE '[0-9]+\.[0-9]+\.[0-9]+') | ||
| echo "Found ccache version ${ccache_ver}" | ||
| echo "ccache_ver=${ccache_ver}" >> $GITHUB_OUTPUT | ||
| ccache --shimgen-noop > ccache-info.txt || true | ||
| a=$(cat ccache-info.txt | grep executable) | ||
| # strip off the initial " path to executable: " | ||
| b=${a:22} | ||
| echo "ccache_path=${b}" >> $GITHUB_OUTPUT | ||
| - name: Build tket | ||
| if: needs.check_changes.outputs.tket_changed == 'true' | ||
| run: | | ||
| $env:TKET_VSGEN_CCACHE_EXE = 'C:\\ProgramData\\chocolatey\\lib\\ccache\\tools\\ccache-${{ steps.ccache-ver.outputs.ccache_ver }}-windows-x86_64\\ccache.exe' | ||
| $env:TKET_VSGEN_CCACHE_EXE = '${{ steps.ccache-path.outputs.ccache_path }}' | ||
| conan build tket --user tket --channel stable -o boost/*:header_only=True -o tklog/*:shared=True -o tket/*:shared=True | ||
| conan export-pkg tket --user tket --channel stable -o boost/*:header_only=True -o tklog/*:shared=True -o tket/*:shared=True -tf `"`" | ||
| - name: Install tket | ||
|
|
@@ -484,17 +486,17 @@ jobs: | |
| conan create recipes/pybind11_json/all --version 0.2.13 | ||
| - name: Set up Python (3.9) | ||
| if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.9" | ||
| - name: Set up Python (3.10) | ||
| if: github.event_name == 'push' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.10" | ||
| - name: Set up Python (3.11) | ||
| if: github.event_name == 'schedule' | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.11" | ||
| - name: Build pytket | ||
|
|
@@ -532,7 +534,7 @@ jobs: | |
| with: | ||
| ref: gh-pages | ||
| - name: Download artefact | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: pytket_test_coverage | ||
| path: htmlcov/ | ||
|
|
@@ -553,12 +555,12 @@ jobs: | |
| check_pytket_coverage: | ||
| name: Check pytket line and branch coverage | ||
| needs: build_test_pytket_ubuntu | ||
| if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' | ||
| if: (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop') || github.event_name == 'workflow_dispatch' | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Download artefact | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: pytket_test_coverage | ||
| path: pytket-test-coverage/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ jobs: | |
|
|
||
| - name: Select Python 3.10 | ||
| # otherwise turtlebrowser/[email protected] fails on macos-12 | ||
| uses: actions/setup-python@v4 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.10' | ||
|
|
||
|
|
@@ -58,13 +58,13 @@ jobs: | |
|
|
||
| - name: Set up container | ||
| run: | | ||
| docker create --name linux_build -i -v /:/host quay.io/pypa/manylinux2014_x86_64:latest /bin/bash | ||
| docker create --name linux_build -i -v /:/host quay.io/pypa/manylinux_2_28_x86_64:latest /bin/bash | ||
| docker cp . linux_build:/tket/ | ||
| - name: Install and upload packages | ||
| run: | | ||
| docker start linux_build | ||
| docker exec -e JFROG_ARTIFACTORY_TOKEN_3="${{ secrets.JFROG_ARTIFACTORY_TOKEN_3 }}" -e JFROG_ARTIFACTORY_USER_3="${{ secrets.JFROG_ARTIFACTORY_USER_3 }}" -e CONAN_PROFILE=linux-x86_64-gcc10-libstdc++ linux_build /bin/bash -c "/tket/.github/workflows/linuxbuildpackages" | ||
| docker exec -e JFROG_ARTIFACTORY_TOKEN_3="${{ secrets.JFROG_ARTIFACTORY_TOKEN_3 }}" -e JFROG_ARTIFACTORY_USER_3="${{ secrets.JFROG_ARTIFACTORY_USER_3 }}" -e CONAN_PROFILE=linux-x86_64-gcc12 linux_build /bin/bash -c "/tket/.github/workflows/linuxbuildpackages" | ||
| build_manylinux_aarch64: | ||
| name: Build on manylinux (aarch64) | ||
|
|
@@ -77,14 +77,14 @@ jobs: | |
| run: | | ||
| export DOCKER_HOST=unix://${HOME}/.docker/run/docker.sock | ||
| docker rm --force -v linux_build | ||
| docker create --name linux_build -i -v /:/host quay.io/pypa/manylinux2014_aarch64:latest /bin/bash | ||
| docker create --name linux_build -i -v /:/host quay.io/pypa/manylinux_2_28_aarch64:latest /bin/bash | ||
| docker cp . linux_build:/tket/ | ||
| - name: Install and upload packages | ||
| run: | | ||
| export DOCKER_HOST=unix://${HOME}/.docker/run/docker.sock | ||
| docker start linux_build | ||
| docker exec -e JFROG_ARTIFACTORY_TOKEN_3="${{ secrets.JFROG_ARTIFACTORY_TOKEN_3 }}" -e JFROG_ARTIFACTORY_USER_3="${{ secrets.JFROG_ARTIFACTORY_USER_3 }}" -e CONAN_PROFILE=linux-armv8-gcc10-libstdc++ linux_build /bin/bash -c "/tket/.github/workflows/linuxbuildpackages" | ||
| docker exec -e JFROG_ARTIFACTORY_TOKEN_3="${{ secrets.JFROG_ARTIFACTORY_TOKEN_3 }}" -e JFROG_ARTIFACTORY_USER_3="${{ secrets.JFROG_ARTIFACTORY_USER_3 }}" -e CONAN_PROFILE=linux-armv8-gcc12 linux_build /bin/bash -c "/tket/.github/workflows/linuxbuildpackages" | ||
| - name: Remove container | ||
| if: always() | ||
|
|
||
Oops, something went wrong.