Skip to content

Commit

Permalink
Merge branch '2023-handoff' of https://github.com/jaraco/skeleton
Browse files Browse the repository at this point in the history
# Conflicts:
#	pyproject.toml
  • Loading branch information
jaraco committed Jul 5, 2023
2 parents e95e53e + 23ed6b1 commit d6b34a4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.11-dev
python-version: 3.x
- name: Install tox
run: |
python -m pip install tox
Expand Down
11 changes: 1 addition & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,5 @@ skip-string-normalization = true

[tool.setuptools_scm]

[tool.pytest-enabler.black]
addopts = "--black"

# disabled
[tool.pytest-enabler.mypy]
# addopts = "--mypy"

[tool.pytest-enabler.cov]
addopts = "--cov"

[tool.pytest-enabler.ruff]
addopts = "--ruff"
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ testing =
pytest-mypy >= 0.9.1; \
# workaround for jaraco/skeleton#22
python_implementation != "PyPy"
pytest-enabler >= 1.3
pytest-enabler >= 2.2
pytest-ruff

# local
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ commands =
skip_install = True
deps =
towncrier
jaraco.develop
jaraco.develop >= 7.23
passenv = *
commands =
python -m jaraco.develop.towncrier build --yes
python -m jaraco.develop.finalize


[testenv:release]
skip_install = True
Expand Down

0 comments on commit d6b34a4

Please sign in to comment.