Skip to content

Commit

Permalink
Merge branch 'drop-eol-python-add-3.12' into master
Browse files Browse the repository at this point in the history
* drop-eol-python-add-3.12:
  Upgrade python version to python 3.8 in tooling configuration
  Drop python 3.6 and 3.7
  Move everything from the setup.cfg to pyproject.toml

Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>

Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Co-authored-by: Irtaza Akram <irtaza.akram@arbisoft.com>
Co-authored-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
  • Loading branch information
3 people committed Dec 4, 2023
2 parents d73c814 + 2280620 commit 4628b60
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 22 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,11 @@ jobs:
- windows-latest
- macos-latest
python-version:
- '3.6'
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
# - '3.12' # FixMe: https://github.com/pylint-dev/pylint-pytest/issues/3
# Python 3.6 is not available in `ubuntu-latest`.
exclude:
- python-version: '3.6'
os: ubuntu-latest
include:
- python-version: '3.6'
os: ubuntu-20.04
# - '3.12' # FixMe: https://github.com/pylint-dev/pylint-pytest/issues/3

defaults:
run:
Expand Down Expand Up @@ -68,7 +59,7 @@ jobs:
env:
FORCE_COLOR: 1
PYTEST_CI_ARGS: --cov-report=xml --junitxml=test_artifacts/test_report.xml --color=yes
run: tox ${{ matrix.python-version == '3.6' && '--skip-missing-interpreters=true' || '' }}
run: tox --skip-missing-interpreters=true

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Removed

* Support for Python 3.6 & 3.7 (https://github.com/pylint-dev/pylint-pytest/pull/23)

## [1.1.7] - 2023-12-04

This is a small release to support additionally Pylint v3.
Expand Down
9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Only a configuration storage, for now
[tool.aliases]
test = "pytest"

[tool.black]
line-length = 100
Expand Down Expand Up @@ -36,7 +38,7 @@ paths.source = [
]

[tool.mypy]
python_version = "3.7"
python_version = "3.8"
check_untyped_defs = true
explicit_package_bases = true
namespace_packages = true
Expand Down Expand Up @@ -89,8 +91,7 @@ ignore = [
"RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
]

# py36, but ruff does not support it :/
target-version = "py37"
target-version = "py38"

[tool.ruff.pydocstyle]
convention = "google"
Expand All @@ -113,7 +114,7 @@ convention = "google"

[tool.pylint]

py-version = "3.6"
py-version = "3.8"

ignore-paths="tests/input" # Ignore test inputs

Expand Down
2 changes: 0 additions & 2 deletions setup.cfg

This file was deleted.

4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,14 @@
"pylint>=2",
"pytest>=4.6",
],
python_requires=">=3.6",
python_requires=">=3.8",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Topic :: Software Development :: Testing",
"Topic :: Software Development :: Quality Assurance",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[tox]
envlist =
py36-pylint2
py37-pylint2
py38-pylint{2,3}
py39-pylint{2,3}
py310-pylint{2,3}
Expand Down

0 comments on commit 4628b60

Please sign in to comment.