Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
# Conflicts:
#	.flake8
#	LICENSE
  • Loading branch information
jaraco committed May 11, 2023
2 parents 7a6910c + d2ec047 commit f218c98
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 27 deletions.
11 changes: 0 additions & 11 deletions .flake8

This file was deleted.

5 changes: 5 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: tests

on: [push, pull_request]

permissions:
contents: read

env:
# Environment variables to support color support (jaraco/skeleton#66):
# Request colored output from CLI tools supporting it. Different tools
Expand Down Expand Up @@ -104,6 +107,8 @@ jobs:
jobs: ${{ toJSON(needs) }}

release:
permissions:
contents: write
needs:
- check
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ addopts = "--black"
[tool.pytest-enabler.mypy]
# addopts = "--mypy"

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

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

[tool.pytest-enabler.ruff]
addopts = "--ruff"
8 changes: 0 additions & 8 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,11 @@ filterwarnings=
# Ensure ResourceWarnings are emitted
default::ResourceWarning

# Suppress deprecation warning in flake8
ignore:SelectableGroups dict interface is deprecated::flake8

# shopkeep/pytest-black#55
ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
ignore:The \(fspath. py.path.local\) argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning
ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning

# tholo/pytest-flake8#83
ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
ignore:The \(fspath. py.path.local\) argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning
ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning

# shopkeep/pytest-black#67
ignore:'encoding' argument not specified::pytest_black

Expand Down
6 changes: 1 addition & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ testing =
# upstream
pytest >= 6
pytest-checkdocs >= 2.4
pytest-flake8; \
# workaround for tholo/pytest-flake8#87
python_version < "3.12"
# workaround for tholo/pytest-flake8#87
flake8 < 5
pytest-black >= 0.3.7; \
# workaround for jaraco/skeleton#22
python_implementation != "PyPy"
Expand All @@ -53,6 +48,7 @@ testing =
# workaround for jaraco/skeleton#22
python_implementation != "PyPy"
pytest-enabler >= 1.3
pytest-ruff

# local
lxml; \
Expand Down

0 comments on commit f218c98

Please sign in to comment.