Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# for syntax see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax

# base rule, tket2 team is codeowner for whole repo
# base rule, tket team is codeowner for whole repo
* @CQCL/tket2

# Add specific rules below.
Expand Down
12 changes: 6 additions & 6 deletions .github/change-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
# to detect changes in each subproject, and only run the corresponding jobs.

rust-core: &rust-core
- "tket2/**"
- "tket/**"
- "Cargo.toml"
- "Cargo.lock"

rust:
- *rust-core
- "tket2-hseries/**"
- "tket-qsystem/**"
- "badger-optimiser/**"
- "compile-rewriter/**"
- "tket1-passes/**"

python:
- *rust-core
- "tket2-py/**"
- "tket2-eccs/**"
- "tket2-exts/**"
- "tket-py/**"
- "tket-eccs/**"
- "tket-exts/**"
- "pyproject.toml"
- "uv.lock"

extensions:
- "tket2-exts/src/tket2_exts/data/tket2/**"
- "tket-exts/src/tket_exts/data/tket/**"
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ updates:
- package-ecosystem: "pip"
directories: # Location of package manifests
- "/"
- "/tket2-py"
- "/tket2-eccs"
- "/tket2-exts"
- "/tket-py"
- "/tket-eccs"
- "/tket-exts"
schedule:
interval: "weekly"
commit-message:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Install cargo-codspeed
run: cargo binstall cargo-codspeed --force
- name: Override criterion with the CodSpeed harness
run: cargo add --dev codspeed-criterion-compat --rename criterion --package tket2
run: cargo add --dev codspeed-criterion-compat --rename criterion --package tket
- name: Build benchmarks
run: cargo codspeed build --profile bench --features portmatching,binary-eccs,rewrite-tracing
- name: Run benchmarks
Expand All @@ -163,9 +163,9 @@ jobs:
- name: Configure default rust toolchain
run: rustup override set ${{steps.toolchain.outputs.name}}
- name: Build with no features
run: cargo test --verbose -p tket2 -p tket2-py -p tket2-hseries --no-default-features --no-run
run: cargo test --verbose -p tket -p tket-py -p tket-qsystem --no-default-features --no-run
- name: Tests with no features
run: cargo test --verbose -p tket2 -p tket2-py -p tket2-hseries --no-default-features
run: cargo test --verbose -p tket -p tket-py -p tket-qsystem --no-default-features

# Run tests on Rust stable
tests-rs-stable-all-features:
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}

# Ensure that serialized extensions match rust implementation
tket2-extensions:
tket-extensions:
needs: [changes, tests-rs-stable-all-features]
if: ${{ needs.changes.outputs.rust == 'true' && github.event_name != 'merge_group' }}
name: Check standard extensions
Expand All @@ -323,11 +323,11 @@ jobs:
run: just gen-extensions
- name: Check if the declarations are up to date
run: |
git diff --exit-code --name-only tket2-exts/src/tket2_exts/data
git diff --exit-code --name-only tket-exts/src/tket_exts/data
if [ $? -ne 0 ]; then
echo "The serialized standard extensions are not up to date"
echo "Please run 'just gen-extensions' and commit the changes.
Bump the version of tket2-exts according to semver.
Bump the version of tket-exts according to semver.
"
exit 1
fi
Expand Down Expand Up @@ -365,7 +365,7 @@ jobs:
# even if they are skipped due to no changes in the relevant files.
required-checks:
name: Required checks 🦀+🐍
needs: [changes, check-rs, check-py, tests-rs-stable-no-features, tests-rs-stable-all-features, tests-py, tket2-extensions, extension-versions]
needs: [changes, check-rs, check-py, tests-rs-stable-no-features, tests-rs-stable-all-features, tests-py, tket-extensions, extension-versions]
if: ${{ !cancelled() }}
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-pure-wheels.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Pure Python wheels 🐍
# Builds and publishes the pure wheels on pypi.
#
# This does not include the main `tket2-py` package, which is built using maturin.
# This does not include the main `tket-py` package, which is built using maturin.
# See `python-wheels.yml` for that workflow.
#
# When running on a release event or as a workflow dispatch for a tag,
Expand Down Expand Up @@ -33,8 +33,8 @@ jobs:
strategy:
matrix:
target:
- { dir: tket2-eccs, name: tket2_eccs}
- { dir: tket2-exts, name: tket2_exts}
- { dir: tket-eccs, name: tket_eccs}
- { dir: tket-exts, name: tket_exts}
steps:
# Check the release tag against the package name
#
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions:
contents: read

env:
MODULE_DIR: tket2-py
MODULE_DIR: tket-py

jobs:
# Check if the tag matches the package name,
Expand All @@ -37,7 +37,7 @@ jobs:
run: |
echo "run=$SHOULD_RUN" >> $GITHUB_OUTPUT
env:
SHOULD_RUN: ${{ github.event_name != 'release' || ( github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket2-py-v') ) }}
SHOULD_RUN: ${{ github.event_name != 'release' || ( github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket-py-v') ) }}

linux:
needs: check-tag
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
name: Release
runs-on: ubuntu-latest
needs: [linux, musllinux, windows, macos, sdist]
if: ${{ (github.event_name == 'release' && github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket2-py-v') ) || (github.event_name == 'workflow_dispatch' && github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket2-py-v') ) }}
if: ${{ (github.event_name == 'release' && github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket-py-v') ) || (github.event_name == 'workflow_dispatch' && github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket-py-v') ) }}
steps:
- uses: actions/download-artifact@v4
- name: Publish to PyPI
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release-checks.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# A check that ensures that `tket2-py` works correctly with the latest release of `tket2-exts` and `tket2-eccs`.
# A check that ensures that `tket-py` works correctly with the latest release of `tket-exts` and `tket-eccs`.
#
# If this fails, it is likely that the packages require a release before we can release the `tket2` python lib.
# If this fails, it is likely that the packages require a release before we can release the `tket` python lib.

name: tket2-py Release checks
name: tket-py Release checks

on:
pull_request:
branches:
- release-please--branches--main--components--tket2-py
- release-please--branches--main--components--tket-py
workflow_dispatch: {}

env:
Expand All @@ -21,7 +21,7 @@ env:

jobs:
py-release:
name: Check `tket2-py` release compatibility
name: Check `tket-py` release compatibility
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -37,8 +37,8 @@ jobs:
run: |
uv sync --no-sources --no-install-workspace \
--python ${{ env.PYTHON_HIGHEST }}
uv pip install --no-sources tket2-exts
uv pip install --no-sources tket2-eccs
uv pip install --no-sources tket-exts
uv pip install --no-sources tket-eccs
uv run --no-sync maturin develop
echo "\nDone! Installed dependencies:"
uv pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semver-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
TKET_C_API_PATH: ${{ github.workspace }}/tket-c-api
LD_LIBRARY_PATH: ${{ github.workspace }}/tket-c-api/lib
steps:
- name: Checkout tket2
- name: Checkout tket
uses: actions/checkout@v4
- name: Install tket-c-api library
uses: ./.github/actions/tket-c-api
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build artifacts
/target
tket2-py/target/
tket-py/target/
/dist

# Python caches
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ repos:
- id: py-test
name: pytest
description: Run python tests
# Ensure that we are using the local version of `tket2-eccs` and not the one from PyPI
# Ensure that we are using the local version of `tket-eccs` and not the one from PyPI
entry: uv run -- sh -c "maturin develop && pytest --cov=./ --cov-report=html"
language: system
files: \.py$
Expand Down
8 changes: 4 additions & 4 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"tket2-py": "0.11.1",
"tket2-eccs": "0.4.0",
"tket2-exts": "0.9.2"
}
"tket-py": "0.11.1",
"tket-eccs": "0.4.0",
"tket-exts": "0.9.2"
}
90 changes: 45 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ lto = "thin"
[workspace]
resolver = "2"
members = [
"tket2",
"tket2-py",
"tket",
"tket-py",
"compile-rewriter",
"badger-optimiser",
"tket2-hseries",
"tket-qsystem",
"tket1-passes",
]
default-members = ["tket2", "tket2-hseries"]
default-members = ["tket", "tket-qsystem"]

[workspace.package]
rust-version = "1.85"
Expand Down Expand Up @@ -88,6 +88,6 @@ cool_asserts = "2.0.3"
zstd = "0.13.3"
anyhow = "1.0.98"

[profile.release.package.tket2-py]
# Some configurations to reduce the size of tket2 wheels
[profile.release.package.tket-py]
# Some configurations to reduce the size of tket wheels
strip = true
Loading
Loading