Skip to content

Commit 24f52ee

Browse files
authored
Merge pull request #46 from PyCQA/drop-py36
drop python 3.6
2 parents 2469ca3 + 5b9e800 commit 24f52ee

File tree

5 files changed

+10
-52
lines changed

5 files changed

+10
-52
lines changed

.github/workflows/main.yml

+5-17
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,22 @@ jobs:
1212
matrix:
1313
include:
1414
# linux
15-
- os: ubuntu-latest
16-
python: 3.6
17-
toxenv: py
1815
- os: ubuntu-latest
1916
python: 3.7
20-
toxenv: py
2117
- os: ubuntu-latest
2218
python: 3.8
23-
toxenv: py
2419
- os: ubuntu-latest
2520
python: 3.9
26-
toxenv: py
2721
- os: ubuntu-latest
28-
python: '3.10.0'
29-
toxenv: py
22+
python: '3.10'
3023
# windows
3124
- os: windows-latest
32-
python: 3.6
33-
toxenv: py
34-
# misc
35-
- os: ubuntu-latest
36-
python: 3.9
37-
toxenv: pre-commit
25+
python: 3.7
3826
runs-on: ${{ matrix.os }}
3927
steps:
40-
- uses: actions/checkout@v2
41-
- uses: actions/setup-python@v2
28+
- uses: actions/checkout@v3
29+
- uses: actions/setup-python@v4
4230
with:
4331
python-version: ${{ matrix.python }}
4432
- run: python -mpip install --upgrade setuptools pip tox virtualenv
45-
- run: tox -e ${{ matrix.toxenv }}
33+
- run: tox -e py

.gitlab-ci.yml

-30
This file was deleted.

.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repos:
1111
rev: v3.9.0
1212
hooks:
1313
- id: reorder-python-imports
14-
args: [--application-directories, '.:src', --py36-plus]
14+
args: [--application-directories, '.:src', --py37-plus]
1515
- repo: https://github.com/psf/black
1616
rev: 22.10.0
1717
hooks:
@@ -21,9 +21,9 @@ repos:
2121
rev: v3.3.0
2222
hooks:
2323
- id: pyupgrade
24-
args: [--py36-plus]
24+
args: [--py37-plus]
2525
- repo: https://github.com/asottile/setup-cfg-fmt
2626
rev: v2.2.0
2727
hooks:
2828
- id: setup-cfg-fmt
29-
args: [--min-py3-version, '3.6']
29+
args: [--min-py3-version, '3.7']

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ py_modules = flake8_docstrings
2727
install_requires =
2828
flake8>=3
2929
pydocstyle>=2.1
30-
python_requires = >=3.6
30+
python_requires = >=3.7
3131

3232
[options.entry_points]
3333
flake8.extension =

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
minversion = 1.6
3-
envlist = pre-commit,py36,py37,py38,py39,py310
3+
envlist = pre-commit,py
44

55
[testenv]
66
deps =

0 commit comments

Comments
 (0)