Skip to content
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

Jump to bottom

Rebase main onto develop #54

Merged
merged 19 commits into from
Oct 17, 2023
Merged

Rebase main onto develop #54

merged 19 commits into from
Oct 17, 2023

Conversation

trvto
Copy link
Collaborator

@trvto trvto commented Oct 17, 2023

No description provided.

cqc-melf and others added 19 commits June 20, 2023 16:40
@cqc-melf
update version, changelog and pytket version
11b1fbc
@cqc-melf
Merge pull request #33 from CQCL/release/1-16-0
397f71c 
Release/1 16 0
@trvto @cqc-melf
Use Poetry for package management and Nox in github actions (#34)
cdfeb02 
* use poetry, changes to noxfile

* set extension version from pyproject.toml

* refactor docs build, add docs build noxfile session

* add mypy session, add dev-requirements.txt, cleanup

* add actions to run nox

* fix inputs name

* fix inputs name

* better run name

* fix test runs

* change naming

* use environment files for github output

* allow 3.10 3.11 for all nox sessions

* add pull request trigger, remove unneeded poetry work around

* add release action, remove unneeded actions

* fix docs-build session name

* naming changes, test dist download

* dist download works, only do it on release

* Add ref name to release run

* move mypy config to pyproject.toml

* update dependencies

* update readme

* restrict python version in pyproject.toml

* remove mypy-check script

* ignore poetry.lock to always use latest version on ci, remove unnecessary pytest.ini

* update extension version, update python version spec

* add checks with pytket pre-release if pre-release exists

* print versions found

* fix pre-release tests, use github token with lastversion

* upload coverage data

* upload coverage data

* run tests on push to develop

* add job that checks that all jobs succeeded

* Run release prep on pull requests

* Update .github/workflows/release.yml

Co-authored-by: cqc-melf <70640934+cqc-melf@users.noreply.github.com>

* Update pyproject.toml

Co-authored-by: cqc-melf <70640934+cqc-melf@users.noreply.github.com>

* Update pyproject.toml

Co-authored-by: cqc-melf <70640934+cqc-melf@users.noreply.github.com>

* Add email for author

* In nox-session workflow use pytket pre-release per default

* update dependabot.yml

* update README.md

* update changelog

* fix changelog

* use rc version

---------

Co-authored-by: cqc-melf <70640934+cqc-melf@users.noreply.github.com>
@dependabot @trvto
Update pyupgrade requirement from ^2.29.0 to >=2.29,<4.0 (#36)
af7fd7e 
Updates the requirements on [pyupgrade](https://github.com/asottile/pyupgrade) to permit the latest version.
- [Commits](asottile/pyupgrade@v2.29.0...v3.9.0)

---
updated-dependencies:
- dependency-name: pyupgrade
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @trvto
Update coverage requirement from ^6.1 to >=6.1,<8.0 (#37)
57370c3 
Updates the requirements on [coverage](https://github.com/nedbat/coveragepy) to permit the latest version.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@6.1...7.2.7)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @trvto
Update pytest-timeout requirement from ^1.4.2 to >=1.4.2,<3.0.0 (#39)
f666a0b 
Updates the requirements on [pytest-timeout](https://github.com/pytest-dev/pytest-timeout) to permit the latest version.
- [Commits](pytest-dev/pytest-timeout@1.4.2...2.1.0)

---
updated-dependencies:
- dependency-name: pytest-timeout
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @trvto
Update sphinx requirement from ^4.3.2 to >=4.3.2,<7.0.0 (#40)
f1cf4e1 
Updates the requirements on [sphinx](https://github.com/sphinx-doc/sphinx) to permit the latest version.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES)
- [Commits](sphinx-doc/sphinx@v4.3.2...v6.2.1)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @trvto
Update pre-commit requirement from ^2.15.0 to >=2.15,<4.0 (#38)
919ba8e 
Updates the requirements on [pre-commit](https://github.com/pre-commit/pre-commit) to permit the latest version.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v2.15.0...v3.3.3)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@trvto
fix link to docs that publish docs job shows (#41)
7835462
@dependabot @trvto
Bump actions/upload-pages-artifact from 1 to 2 (#42)
80e39e3 
Bumps [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) from 1 to 2.
- [Release notes](https://github.com/actions/upload-pages-artifact/releases)
- [Commits](actions/upload-pages-artifact@v1...v2)

---
updated-dependencies:
- dependency-name: actions/upload-pages-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@cqc-melf @trvto
Update tests.yml (#43)
dc63642 
* Update tests.yml

* Update .github/workflows/tests.yml
@dependabot @trvto
Bump poetry from 1.5.1 to 1.6.1 (#45)
a7de95e 
Bumps [poetry](https://github.com/python-poetry/poetry) from 1.5.1 to 1.6.1.
- [Release notes](https://github.com/python-poetry/poetry/releases)
- [Changelog](https://github.com/python-poetry/poetry/blob/master/CHANGELOG.md)
- [Commits](python-poetry/poetry@1.5.1...1.6.1)

---
updated-dependencies:
- dependency-name: poetry
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@trvto
use pytket 1.19 and fix resulting mypy issues (#46)
df1876b 
* use pytket 1.19 and fix resulting mypy issues

* remove more type ignores
@dependabot @trvto
Bump actions/checkout from 3 to 4 (#47)
c6a82d5 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@cqc-melf @trvto
mypy warn-unused-ignore (#49)
8df8b58 
* warn-unused-ignore

* fix mypy
@trvto
Automatic multizone routing (#48)
50e4827 
* implement initial routing

* allow custom initial placement

* remove not implemented

* add documentation

* review suggestions

* better documentation of move_qubit

* test get_n_shuttles and get_n_pswaps

* docstring for  get_n_shuttles and get_n_pswaps

* Allow generate AQT syntax directly from pytket circuit

* refactor architecture class, add print function and another named architecture

* add docstring

* add test for architecture string, add copyright notices in test files

* update changelog

* use equivalent definition of diamond pattern arch
@cqc-alec @trvto
[feature] Make SimplifyInitial opt-in (#50)
75a64b2
@dependabot @trvto
Update pylint requirement from ^2.13, !=2.13.6 to >=2.13,<4.0 (#51)
4924428 
Updates the requirements on [pylint](https://github.com/pylint-dev/pylint) to permit the latest version.
- [Release notes](https://github.com/pylint-dev/pylint/releases)
- [Commits](pylint-dev/pylint@v2.13.0...v3.0.1)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@trvto
remove no longer necessary casts (#52)
ee6a4a3
@trvto trvto requested a review from cqc-melf as a code owner October 17, 2023 12:23
@trvto trvto changed the title Rebase main to develop Rebase develop onto main Oct 17, 2023
@trvto trvto changed the title Rebase develop onto main Rebase main onto develop Oct 17, 2023
@cqc-melf
Copy link
Collaborator

What it the rebase-main branch created from?

@trvto
Copy link
Collaborator Author

trvto commented Oct 17, 2023

What it the rebase-main branch created from?

from develop. Then rebased the two missing commits from main

@trvto trvto merged commit 54b614c into develop Oct 17, 2023
15 checks passed
@cqc-melf cqc-melf mentioned this pull request Oct 17, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cqc-melf cqc-melf cqc-melf approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@trvto @cqc-melf @cqc-alec