Skip to content

Commit

Permalink
Merge pull request #48 from CQCL/release/1.9.0
Browse files Browse the repository at this point in the history
Release/1.9.0
  • Loading branch information
cqc-melf authored Nov 25, 2022
2 parents 383bc2a + 0778b61 commit 46c9e42
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 27 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build-test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 26 additions & 22 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
branches:
- develop
- 'wheel/**'
- 'runci/**'
release:
types:
- created
Expand Down Expand Up @@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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 "[email protected]"
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
6 changes: 3 additions & 3 deletions .github/workflows/issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ 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
issuetype: Bug
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
Expand Down
2 changes: 1 addition & 1 deletion _metadata.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__extension_version__ = "0.24.0"
__extension_version__ = "0.25.0"
__extension_name__ = "pytket-braket"
5 changes: 5 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
~~~~~~~~~

0.25.0 (November 2022)
----------------------

* Updated pytket version requirement to 1.9.

0.24.0 (November 2022)
----------------------

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 46c9e42

Please sign in to comment.