Skip to content

Commit cef343d

Browse files
github-actions[bot]web-flowTakishima
authored
Merge master into develop branch (#431)
* Preparing release vv0.7.2 * Fix missed bug in optimize.py * Fix typo in _optimize.py * Fix linters/formatters warnings * Update missed hooks * Hotfix: fix GitHub action workflows Co-authored-by: GitHub actions <noreply@github.com> Co-authored-by: Nguyen Damien <ngn.damien@gmail.com>
1 parent b22a278 commit cef343d

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

.github/workflows/draft_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: make-commit
3939
run: |
4040
git add CHANGELOG.md
41-
git commit --message "Preparing release v${{ github.event.inputs.tag }}"
41+
git commit --message "Preparing release ${{ github.event.inputs.tag }}"
4242
4343
echo "::set-output name=commit::$(git rev-parse HEAD)"
4444

.github/workflows/publish_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: |
5252
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
5353
VERSION=${BRANCH_NAME#release/}
54-
git tag v${VERSION} master
54+
git tag ${VERSION} master
5555
5656
- name: Extract version from branch name (for hotfix branches) (Unix)
5757
if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'hotfix/') && runner.os != 'Windows'
@@ -156,7 +156,7 @@ jobs:
156156
if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'release/')
157157
run: |
158158
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
159-
VERSION=${BRANCH_NAME#release/}
159+
VERSION=${BRANCH_NAME#release/v}
160160
161161
echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
162162

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repos:
2323
- id: check-useless-excludes
2424

2525
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v4.1.0
26+
rev: v4.2.0
2727
hooks:
2828
- id: check-added-large-files
2929
- id: check-case-conflict

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v0.7.2] - 2022-04-11
11+
1012
### Changed
11-
- Added IonQ dynamic backends fetch.
13+
14+
- Added IonQ dynamic backends fetch.
1215

1316
### Repository
1417

1518
- Fix issues with building on CentOS 7 & 8
19+
- Update `pre-commit/pre-commit-hooks` to v4.2.0
1620
- Update `Lucas-C/pre-commit-hooks` hook to v1.1.13
1721
- Update `flake8` hook to v4.0.1
1822
- Update `pylint` hook to v3.0.0a4
@@ -180,7 +184,9 @@ The ProjectQ v0.5.x release branch is the last one that is guaranteed to work wi
180184

181185
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)
182186

183-
[Unreleased]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.1...HEAD
187+
[Unreleased]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.2...HEAD
188+
189+
[v0.7.2]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.1...v0.7.2
184190

185191
[0.7.1]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.0...v0.7.1
186192

projectq/cengines/_optimize.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,10 @@ def receive(self, command_list):
240240
"""
241241
for cmd in command_list:
242242
if cmd.gate == FlushGate(): # flush gate --> optimize and flush
243-
for idx, _l in self._l.items():
243+
# NB: self.optimize(i) modifies self._l
244+
for idx in self._l: # pylint: disable=consider-using-dict-items
244245
self._optimize(idx)
245-
self._send_qubit_pipeline(idx, len(_l))
246+
self._send_qubit_pipeline(idx, len(self._l[idx]))
246247
new_dict = {}
247248
for idx, _l in self._l.items():
248249
if len(_l) > 0: # pragma: no cover

0 commit comments

Comments
 (0)