From 1e3b65ffa91e39fa82b99b162e9b2632a9a6f36f Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Mon, 21 Nov 2022 17:12:03 +0000 Subject: [PATCH 1/6] Update/ci jira 3 0 0 (#45) * Bump atlassian/gajira-create from 2.0.1 to 3.0.0 (#44) Bumps [atlassian/gajira-create](https://github.com/atlassian/gajira-create) from 2.0.1 to 3.0.0. - [Release notes](https://github.com/atlassian/gajira-create/releases) - [Commits](https://github.com/atlassian/gajira-create/compare/v2.0.1...v3.0.0) --- updated-dependencies: - dependency-name: atlassian/gajira-create dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump atlassian/gajira-login from 2.0.0 to 3.0.0 (#43) Bumps [atlassian/gajira-login](https://github.com/atlassian/gajira-login) from 2.0.0 to 3.0.0. - [Release notes](https://github.com/atlassian/gajira-login/releases) - [Commits](https://github.com/atlassian/gajira-login/compare/v2.0.0...v3.0.0) --- updated-dependencies: - dependency-name: atlassian/gajira-login dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/issue.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/issue.yml b/.github/workflows/issue.yml index f84c6dc..c461b59 100644 --- a/.github/workflows/issue.yml +++ b/.github/workflows/issue.yml @@ -10,13 +10,13 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Login - uses: atlassian/gajira-login@v2.0.0 + uses: atlassian/gajira-login@v3.0.0 env: JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} - name: Create Bug - uses: atlassian/gajira-create@v2.0.1 + uses: atlassian/gajira-create@v3.0.0 if: contains(github.event.issue.labels.*.name, 'bug') with: project: TKET @@ -24,7 +24,7 @@ jobs: summary: « [pytket-braket] ${{ github.event.issue.title }}» description: ${{ github.event.issue.html_url }} - name: Create Task - uses: atlassian/gajira-create@v2.0.1 + uses: atlassian/gajira-create@v3.0.0 if: "! contains(github.event.issue.labels.*.name, 'bug')" with: project: TKET From b178214708de08e83ae8a42086edeb3bd1b90ab7 Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Thu, 24 Nov 2022 08:31:18 +0000 Subject: [PATCH 2/6] update tket version to pre release (#46) --- .github/workflows/build-test | 3 +++ .github/workflows/build_and_test.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test b/.github/workflows/build-test index c33fe90..c863515 100755 --- a/.github/workflows/build-test +++ b/.github/workflows/build-test @@ -53,6 +53,9 @@ cd ${GITHUB_WORKSPACE}/tests python -m pip install --pre -r test-requirements.txt +# update the pytket version to the lastest (pre) release +python -m pip install --upgrade --pre pytket~=1.0 + # temporary fix, see https://github.com/CQCL/pytket-braket/issues/36 if [[ "${NUMPY}" = "numpyfix" ]] then diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f3dbaa6..6063ee4 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -9,6 +9,7 @@ on: branches: - develop - 'wheel/**' + - 'runci/**' release: types: - created @@ -47,7 +48,6 @@ jobs: run: | ./.github/workflows/build-test nomypy numpy - name: Set up Python 3.9 - if: github.event_name == 'pull_request' || github.event_name == 'release' || contains(github.ref, 'refs/heads/wheel') || github.event_name == 'schedule' uses: actions/setup-python@v4 with: python-version: '3.9' @@ -58,7 +58,7 @@ jobs: env: PYTKET_RUN_REMOTE_TESTS: 1 - name: Build and test including remote checks (3.9) nomypy - if: (matrix.os != 'macos-12') && ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'release' || contains(github.ref, 'refs/heads/wheel') || github.event_name == 'schedule') + if: (matrix.os != 'macos-12') && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'release' || github.event_name == 'schedule') shell: bash run: | ./.github/workflows/build-test nomypy numpy From c0bf7e58d1d219172f4fce202c133cf799fa3720 Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Fri, 25 Nov 2022 11:05:16 +0000 Subject: [PATCH 3/6] update doc build to use github deployment (#47) * update doc build to use github deployment * add empty line add the end of the file --- .github/workflows/build_and_test.yml | 44 +++++++++++++++------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6063ee4..762f33e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -115,8 +115,8 @@ jobs: password: ${{ secrets.PYPI_PYTKET_BRAKET_API_TOKEN }} verbose: true - docs: - name: Build and publish docs + build_docs: + name: Build docs if: github.event_name == 'release' needs: publish_to_pypi runs-on: ubuntu-22.04 @@ -134,7 +134,7 @@ jobs: path: wheelhouse - name: Install pip, wheel run: pip install -U pip wheel - - name: Install extensions + - name: Install extension run: for w in `find wheelhouse/ -type f -name "*.whl"` ; do pip install $w ; done - name: Install docs dependencies run: | @@ -144,20 +144,24 @@ jobs: run: | cd .github/workflows/docs mkdir extensions - ./build-docs -d ${GITHUB_WORKSPACE}/.github/workflows/docs/extensions - - name: Configure git - run: | - git config --global user.email "tket-bot@cambridgequantum.com" - git config --global user.name "«$GITHUB_WORKFLOW» github action" - - name: Check out gh-pages branch - run: git checkout gh-pages - - name: Remove old docs - run: git rm -r --ignore-unmatch docs/api - - name: Add generated docs to repository - run: | - mkdir -p docs - mv .github/workflows/docs/extensions docs/api - git add -f docs/api - git commit --allow-empty -m "Add generated documentation." - - name: Publish docs - run: git push origin gh-pages:gh-pages + ./build-docs -d ${GITHUB_WORKSPACE}/.github/workflows/docs/extensions/api + - name: Upload docs as artefact + uses: actions/upload-pages-artifact@v1 + with: + path: .github/workflows/docs/extensions + + publish_docs: + name: Publish docs + if: github.event_name == 'release' + needs: build_docs + runs-on: ubuntu-22.04 + permissions: + pages: write + id-token: write + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v1 From 4b71192c0455594350b5bd7924630a09a58459b4 Mon Sep 17 00:00:00 2001 From: melf Date: Fri, 25 Nov 2022 11:24:43 +0000 Subject: [PATCH 4/6] update changelog --- docs/changelog.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index c90102a..5e9e454 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,11 @@ Changelog ~~~~~~~~~ +0.25.0 (November 2022) +---------------------- + +* Updated pytket version requirement to 1.9. + 0.24.0 (November 2022) ---------------------- From 9a6367fa8b17f883e9c353e0f9c922162b313226 Mon Sep 17 00:00:00 2001 From: melf Date: Fri, 25 Nov 2022 11:27:34 +0000 Subject: [PATCH 5/6] update pytket version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ee337dc..57f7bf6 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ packages=find_namespace_packages(include=["pytket.*"]), include_package_data=True, install_requires=[ - "pytket ~= 1.8", + "pytket ~= 1.9", "amazon-braket-sdk ~= 1.31", "amazon-braket-schemas ~= 1.10", "amazon-braket-default-simulator ~= 1.9", From 0778b61055ce675110c39cbfc9962374d291a9ab Mon Sep 17 00:00:00 2001 From: melf Date: Fri, 25 Nov 2022 11:35:12 +0000 Subject: [PATCH 6/6] update version in metadata --- _metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_metadata.py b/_metadata.py index 3936a73..2d5bd90 100644 --- a/_metadata.py +++ b/_metadata.py @@ -1,2 +1,2 @@ -__extension_version__ = "0.24.0" +__extension_version__ = "0.25.0" __extension_name__ = "pytket-braket"