Skip to content

Merge master into develop branch #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Takishima merged 9 commits into from
Apr 27, 2022
Merged

Merge master into develop branch #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4bee4d0
Preparing release vv0.7.2
web-flow Apr 11, 2022
b459f90
Fix missed bug in optimize.py
Takishima Apr 11, 2022
7189295
Fix typo in _optimize.py
Takishima Apr 11, 2022
bd3433c
Fix linters/formatters warnings
Takishima Apr 11, 2022
4d01582
Update missed hooks
Takishima Apr 11, 2022
7a3b95b
Merge pull request #430 from ProjectQ-Framework/release/v0.7.2
Takishima Apr 11, 2022
2b48dd4
Hotfix: fix GitHub action workflows
Takishima Apr 11, 2022
7145676
Release version v0.7.3 (#435)
github-actions[bot] Apr 27, 2022
0a4e247
Merge branch 'develop' into master
Takishima Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/publish_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,16 @@ jobs:
run: |
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
VERSION=${BRANCH_NAME#release/}
echo "VERSION = ${VERSION}"
git tag ${VERSION} master

- name: Extract version from branch name (for hotfix branches) (Unix)
if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'hotfix/') && runner.os != 'Windows'
run: |
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
VERSION=${BRANCH_NAME#hotfix/}
git tag v${VERSION} master
echo "VERSION = ${VERSION}"
git tag ${VERSION} master

# ------------------------------------------------------------------------

Expand All @@ -67,14 +69,16 @@ jobs:
run: |
$BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
$VERSION = $BRANCH_NAME -replace "release/",""
git tag v${VERSION} master
Write-Output "VERSION = ${VERSION}"
git tag ${VERSION} master

- name: Extract version from branch name (for hotfix branches) (Windows)
if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'hotfix/') && runner.os == 'Windows'
run: |
$BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
$VERSION = $BRANCH_NAME -replace "hotfix/",""
git tag v${VERSION} master
Write-Output "VERSION = ${VERSION}"
git tag ${VERSION} master

# ========================================================================

Expand Down Expand Up @@ -164,7 +168,7 @@ jobs:
if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'hotfix/')
run: |
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
VERSION=${BRANCH_NAME#hotfix/}
VERSION=${BRANCH_NAME#hotfix/v}

echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV

Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v0.7.3] - 2022-04-27

### Fixed

- Fixed IonQ dynamic backends fetch, which relied on an incorrect path.

## [v0.7.2] - 2022-04-11
Expand Down Expand Up @@ -186,7 +190,9 @@ The ProjectQ v0.5.x release branch is the last one that is guaranteed to work wi

Future releases might introduce changes that will require Python 3.5 (Python 3.4 and earlier have already been declared deprecated at the time of this writing)

[Unreleased]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.2...HEAD
[Unreleased]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.3...HEAD

[v0.7.3]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.2...v0.7.3

[v0.7.2]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.1...v0.7.2

Expand Down