diff options
| author | Anthony Sottile <asottile@umich.edu> | 2022-12-13 01:22:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-13 01:22:48 -0500 |
| commit | 7023956c8975d34317aa146b8e3d73ebd43d204c (patch) | |
| tree | 0d84d5422bd5747d9f5397a7988cea24a036a058 | |
| parent | 0fd8b014cecae05ef4491254fa76fc765ec052c4 (diff) | |
| parent | e20394e5cbd8d440c9c1868ddc25d036afcbfe45 (diff) | |
| download | pep8-7023956c8975d34317aa146b8e3d73ebd43d204c.tar.gz | |
Merge pull request #1129 from PyCQA/drop-py36
drop python3.6
| -rw-r--r-- | .github/workflows/main.yml | 14 | ||||
| -rw-r--r-- | .pre-commit-config.yaml | 4 | ||||
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | testsuite/test_api.py | 5 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00f5e75..b2eba4c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,10 +14,7 @@ jobs: py: 3.9 toxenv: py - os: ubuntu-latest - py: pypy3 - toxenv: py - - os: ubuntu-latest - py: 3.6 + py: pypy3.9 toxenv: py - os: ubuntu-latest py: 3.7 @@ -32,15 +29,18 @@ jobs: py: '3.10' toxenv: py - os: ubuntu-latest - py: '3.11-dev' + py: '3.11' + toxenv: py + - os: ubuntu-latest + py: '3.12-dev' toxenv: py - os: ubuntu-latest py: 3.9 toxenv: flake8 runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.py }} - run: pip install tox diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 061253f..c477ffe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,12 +11,12 @@ repos: rev: v3.9.0 hooks: - id: reorder-python-imports - args: [--py36-plus] + args: [--py37-plus] - repo: https://github.com/asottile/pyupgrade rev: v3.3.0 hooks: - id: pyupgrade - args: [--py36-plus] + args: [--py37-plus] - repo: https://github.com/pycqa/flake8 rev: 6.0.0 hooks: @@ -31,7 +31,7 @@ setup( py_modules=['pycodestyle'], include_package_data=True, zip_safe=False, - python_requires='>=3.6', + python_requires='>=3.7', entry_points={ 'console_scripts': [ 'pycodestyle = pycodestyle:_main', @@ -45,9 +45,6 @@ setup( 'Operating System :: OS Independent', '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 :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Software Development :: Libraries :: Python Modules', diff --git a/testsuite/test_api.py b/testsuite/test_api.py index 8dde32f..38e34ac 100644 --- a/testsuite/test_api.py +++ b/testsuite/test_api.py @@ -329,7 +329,10 @@ class APITestCase(unittest.TestCase): count_errors = pep8style.input_file('stdin', lines=['\x00\n']) stdout = sys.stdout.getvalue() - expected = "stdin:1:1: E901 ValueError" + if sys.version_info < (3, 12): + expected = "stdin:1:1: E901 ValueError" + else: + expected = "stdin:1:1: E901 SyntaxError: source code string cannot contain null bytes" # noqa: E501 self.assertTrue(stdout.startswith(expected), msg='Output %r does not start with %r' % (stdout, expected)) @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py36, py37, py38, py39, py310, pypy3 +envlist = py, pypy3 skip_missing_interpreters = True [testenv] |