Skip to content

Commit

Permalink
Merge branch 'main' into tomli
Browse files Browse the repository at this point in the history
  • Loading branch information
carsongee authored Oct 6, 2023
2 parents f614298 + 578953e commit 5b9dfa2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11.0-rc - 3.11"
- "3.11"
- "3.12.0-rc - 3.12"

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions pytest_pylint/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def pytest_configure(self, config):
try:
pylintrc_file = next(pylint_config.find_default_config_files(), None)
except AttributeError:
# pylint: disable=no-member
pylintrc_file = pylint_config.PYLINTRC

if pylintrc_file and not exists(pylintrc_file):
Expand Down Expand Up @@ -396,4 +397,5 @@ def repr_failure(self, excinfo, style=None):

def reportinfo(self):
"""Generate our test report"""
# pylint: disable=no-member
return self.fspath, None, f"[pylint] {self.parent.rel_path}"
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Plugin for py.test for doing pylint tests
"""

# pylint: disable=import-error
from setuptools import setup

with open("README.rst", encoding="utf-8") as f:
Expand All @@ -24,7 +24,7 @@
entry_points={"pytest11": ["pylint = pytest_pylint.plugin"]},
python_requires=">=3.7",
install_requires=[
"pytest>=5.4",
"pytest>=5.4,<8.0",
"pylint>=2.3.0",
"tomli>=1.1.0; python_version < '3.11'",
],
Expand All @@ -34,10 +34,10 @@
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
)
15 changes: 8 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
[tox]
envlist =
py3{7, 8, 9}-pylint{23}-pytest{54}
py3{7, 8, 9, 10}-pylint{213, 214}-pytest{71}
py3{7, 8, 9, 10, 11}-pylint{215, latest, main}-pytest{71, latest, main}
py3{8, 9}-pylint{26, 30}-pytest{54}
py3{8, 9, 10}-pylint{213, 214, 30}-pytest{71}
py3{8, 9, 10, 11}-pylint{215, latest, main}-pytest{71, latest}
py3{12}-pylint{latest, main}-pytest{71, latest}
coverage
qa
skip_missing_interpreters = true

[testenv]
usedevelop = true
deps =
pylint23: pylint~=2.3.1
pylint30: pylint~=3.0
pylint26: pylint~=2.6.0
pylint213: pylint~=2.13.9
pylint214: pylint~=2.14.5
pylint215: pylint~=2.15.0
pylintlatest: pylint
pylintmain: git+https://github.com/PyCQA/pylint.git@main#egg=pylint
pylintmain: git+https://github.com/PyCQA/astroid.git@main#egg=astroid
pytest54: pytest~=5.4.3
pytest71: pytest~=7.1.2
pytest7: pytest~=7.1.2
pytestlatest: pytest
pytestmain: git+https://github.com/pytest-dev/pytest.git@main#egg=pytest
coverage
commands =
coverage run -m py.test {posargs}
coverage run -m pytest {posargs}

[testenv:coverage]
depends = py3{7, 8, 9, 10, 11}-pylint{215, latest, main}-pytest{71, latest, main}
Expand Down

0 comments on commit 5b9dfa2

Please sign in to comment.