diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 2249c44b..fe08f535 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -52,7 +52,7 @@ jobs: run: poetry run pytest - name: Install tket2 dependencies - run: poetry install --extras=pytket + run: poetry install --with pytket - name: Rerun `py(...)` expression tests with tket2 installed run: poetry run pytest tests/integration/test_py.py tests/error/test_py_errors.py diff --git a/README.md b/README.md index 2675c763..f9898092 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ poetry run pytest -v You have to install extra dependencies to test automatic circuit conversion from `pytket`: ```sh -poetry install --extras=pytket +poetry install --with pytket poetry run pytest -v # Now rerun tests ``` diff --git a/poetry.lock b/poetry.lock index aab547c6..4bad347d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -842,7 +842,7 @@ mpmath = ">=0.19" name = "tket2-py" version = "0.0.0-alpha.1" description = "pytket extension for the tket 2 compiler" -optional = true +optional = false python-versions = ">=3.10" files = [] develop = false @@ -906,10 +906,7 @@ platformdirs = ">=3.9.1,<5" docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] -[extras] -pytket = ["pytket", "tket2-py"] - [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "38603201ab598596fc0671e329e91573b78f55f1420767cfbffae55a291fe32c" +content-hash = "f1ece99102a0240654d7058ebefd3eb8a48dfc9d1e6a30116e4e8b50bcc44d01" diff --git a/pyproject.toml b/pyproject.toml index b3cce387..35facba9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,8 +13,6 @@ graphviz = "^0.20.1" networkx = "^3.2.1" pydantic = "^2.5.3" typing-extensions = "^4.9.0" -pytket = { version = "^1.24.0", optional = true } -tket2-py = { git = "https://github.com/CQCL/tket2.git", optional = true, rev = "9e941f3" } [tool.poetry.group.dev.dependencies] pytest = "^7.4.4" @@ -28,10 +26,15 @@ pytket = "*" optional = true [tool.poetry.group.validation.dependencies] -guppyval = {path = "validator"} +guppyval = { path = "validator" } -[tool.poetry.extras] -pytket = ["pytket", "tket2-py"] + +[tool.poetry.group.pytket] +optional = true + +[tool.poetry.group.pytket.dependencies] +pytket = { version = "^1.24.0" } +tket2-py = {git = "https://github.com/CQCL/tket2.git", rev = "9e941f3"} [build-system]