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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ jobs:
uses: astral-sh/setup-uv@v3
with:
enable-cache: true
- name: "Install in dev mode"
run: |
uv venv
uv pip install -e .[dev]
- name: "Install development environment"
run: uv sync --locked
- name: "Import package"
run: "uv run python -c 'import hamcrest; print(hamcrest.__version__)'"
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ This ensures code style checks run automatically before each commit.
With `uv` installed, prefixing all commands with `uv run` ensures they run with the project dependencies. If you want to work in a virtualenv, so that you can run bare commands, you can do so this way:

```shell
uv venv
uv pip install -e '.[dev]'
uv sync
. .venv/bin/activate
```

Expand Down
33 changes: 14 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,33 +47,28 @@ dynamic = ["version"]

[project.optional-dependencies]
docs = ["sphinx~=7.0", "alabaster~=0.7"]
tests = [
"pytest>=5.0",
"pytest-sugar",
"pytest-xdist",
"coverage[toml]",
# No point on Pypy thanks to https://github.com/python/typed_ast/issues/111
"pytest-mypy-plugins; platform_python_implementation != 'PyPy'",
# Can't use 0.940: https://github.com/python/mypy/issues/12339

[dependency-groups]
typing = [
"mypy<=1.10.1; platform_python_implementation != 'PyPy'",
"types-mock",
]
test = [
{ include-group = "typing" },
"coverage[toml]",
"pytest",
"pytest-mypy-plugins; platform_python_implementation != 'PyPy'",
"pytest-sugar",
"pytest-xdist",
"pyyaml",
]
tests-numpy = [
"PyHamcrest[tests]",
test-numpy = [
{ include-group = "test" },
"numpy",
]
dev = [
"PyHamcrest[docs,tests]",
{ include-group = "test" },
"towncrier",
"twine",
"mypy<=1.10.1",
"pytest-mypy",
"flake8",
"black",
"tox",
"tox-uv",
"doc2dash",
]

[project.urls]
Expand Down
33 changes: 18 additions & 15 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,32 @@ isolated_build = True
# https://github.com/pypa/setuptools/issues/1042 from breaking our builds.
setenv =
VIRTUALENV_NO_DOWNLOAD=1
extras = {env:TOX_AP_TEST_EXTRAS:tests}
dependency_groups = test
commands = python -m pytest {posargs}


[testenv:py310-numpy]
extras = tests-numpy
dependency_groups = test-numpy
commands = python -m pytest {posargs}


[testenv:py311-numpy]
extras = tests-numpy
dependency_groups = test-numpy
commands = python -m pytest {posargs}


[testenv:py312-numpy]
extras = tests-numpy
dependency_groups = test-numpy
commands = python -m pytest {posargs}


[testenv:py313-numpy]
extras = tests-numpy
dependency_groups = test-numpy
commands = python -m pytest {posargs}


[testenv:py314-numpy]
extras = tests-numpy
dependency_groups = test-numpy
commands = python -m pytest {posargs}


Expand All @@ -66,7 +66,7 @@ commands = python -m pytest {posargs}
basepython = python3.10
setenv =
PYTHONWARNINGS=d
extras = {env:TOX_AP_TEST_EXTRAS:tests}
dependency_groups = test
commands = coverage run -m pytest {posargs}


Expand All @@ -76,7 +76,7 @@ commands = coverage run -m pytest {posargs}
basepython = python3.11
setenv =
PYTHONWARNINGS=d
extras = {env:TOX_AP_TEST_EXTRAS:tests}
dependency_groups = test
commands = coverage run -m pytest {posargs}


Expand All @@ -86,7 +86,7 @@ commands = coverage run -m pytest {posargs}
basepython = python3.12
setenv =
PYTHONWARNINGS=d
extras = {env:TOX_AP_TEST_EXTRAS:tests}
dependency_groups = test
commands = coverage run -m pytest {posargs}


Expand All @@ -96,7 +96,7 @@ commands = coverage run -m pytest {posargs}
basepython = python3.13
setenv =
PYTHONWARNINGS=d
extras = {env:TOX_AP_TEST_EXTRAS:tests}
dependency_groups = test
commands = coverage run -m pytest {posargs}


Expand All @@ -106,12 +106,13 @@ commands = coverage run -m pytest {posargs}
basepython = python3.14
setenv =
PYTHONWARNINGS=d
extras = {env:TOX_AP_TEST_EXTRAS:tests}
dependency_groups = test
commands = coverage run -m pytest {posargs}


[testenv:coverage-report]
basepython = python3.14
dependency_groups =
skip_install = true
deps = coverage[toml]>=5.0.2
commands =
Expand All @@ -121,6 +122,7 @@ commands =

[testenv:lint]
basepython = python3.14
dependency_groups =
skip_install = true
deps =
pre-commit
Expand All @@ -132,13 +134,15 @@ commands =
[testenv:docs]
# Keep basepython in sync with gh-actions and .readthedocs.yml.
basepython = python3.14
dependency_groups =
extras = docs
commands =
sphinx-build -n -T -b html -d {envtmpdir}/doctrees doc doc/_build/html


[testenv:pypi-description]
basepython = python3.14
dependency_groups =
skip_install = true
deps =
twine
Expand All @@ -150,17 +154,16 @@ commands =

[testenv:changelog]
basepython = python3.14
deps =
dependency_groups =
deps =
towncrier
skip_install = true
commands = towncrier --draft


[testenv:typing]
basepython = python3.14
deps =
mypy <= 1.10.1
types-mock
dependency_groups = typing
commands =
mypy src/

Expand Down
Loading
Loading