Skip to content

Commit df533f1

Browse files
authored
Remove support for Python 3.6 (#189)
* Remove py36 requirements files * Update tox config * Remove old requirements README * Clean requirements Makefile of py36 helper recipes * Remove py36 from setup.py * Remove py36 from GHA * Update CHANGELOG
1 parent b11b9f1 commit df533f1

File tree

8 files changed

+17
-271
lines changed

8 files changed

+17
-271
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,21 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
11+
python-version: ["3.7", "3.8", "3.9", "3.10"]
1212

1313
steps:
14+
1415
- uses: actions/checkout@v1
16+
1517
- name: Set up Python ${{ matrix.python-version }}
1618
uses: actions/setup-python@v2
1719
with:
1820
python-version: ${{ matrix.python-version }}
21+
1922
- name: Install dependencies
2023
run: |
2124
python -m pip install --upgrade pip
2225
pip install tox tox-gh-actions
26+
2327
- name: Test with tox
2428
run: tox

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ Unreleased_
1414
See also `latest documentation
1515
<https://flake8-aaa.readthedocs.io/en/latest/#__unreleased_marker__>`_.
1616

17+
Removed
18+
.......
19+
20+
* Support for Python 3.6 `#189
21+
<https://github.com/jamescooke/flake8-aaa/pull/189>`_
22+
1723
0.12.1_ - 2022/01/01
1824
--------------------
1925

requirements/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ all: $(outputs)
77
%.txt: %.in
88
pip-compile --verbose --output-file $@ $<
99

10-
# Temporary helper: remove when py36 goes
11-
examples-py36.txt: examples.in
12-
pip-compile examples.in --output-file examples-py36.txt
13-
test-py36.txt: test.in
14-
pip-compile test.in --output-file test-py36.txt
15-
1610
# Dependency chain
1711
test.txt: base.txt
1812
dev.txt: test.txt

requirements/README.rst

Lines changed: 0 additions & 35 deletions
This file was deleted.

requirements/examples-py36.txt

Lines changed: 0 additions & 67 deletions
This file was deleted.

requirements/test-py36.txt

Lines changed: 0 additions & 150 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def readme():
2828
# --- Python ---
2929
packages=find_packages('src'),
3030
package_dir={'': 'src'},
31-
python_requires='>=3.6, <4',
31+
python_requires='>=3.7, <4',
3232
install_requires=[
3333
'asttokens >= 2',
3434
],
@@ -44,7 +44,6 @@ def readme():
4444
'License :: OSI Approved :: MIT License',
4545
'Programming Language :: Python :: 3 :: Only',
4646
'Programming Language :: Python :: 3',
47-
'Programming Language :: Python :: 3.6',
4847
'Programming Language :: Python :: 3.7',
4948
'Programming Language :: Python :: 3.8',
5049
'Programming Language :: Python :: 3.9',

tox.ini

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,21 @@
3030
# Run pytest on test suite.
3131

3232
[tox]
33-
envlist = py3{6,7,8,9,10}-{install,lint,examples,examples_aaa,test,cmd,cmdbad},py310-doc
33+
envlist = py3{7,8,9,10}-{install,lint,examples,examples_aaa,test,cmd,cmdbad},py310-doc
3434

3535
[testenv]
3636
deps =
3737
doc,lint,test: -rrequirements/base.txt
38-
doc,py3{7,8,9,10}-lint,py3{7,8,9,10}-test: -rrequirements/test.txt
39-
py36-test,py36-lint: -rrequirements/test-py36.txt
40-
py36-examples: -rrequirements/examples-py36.txt
41-
py3{7,8,9,10}-examples: -rrequirements/examples.txt
38+
doc,lint,test: -rrequirements/test.txt
39+
examples: -rrequirements/examples.txt
4240
examples_aaa: flake8>=4
4341
install: flake8>=4
4442
commands =
4543
cmd: make cmd
4644
cmdbad: make cmdbad
4745
doc: make doc
4846
examples: {[examples]commands}
49-
py38-examples: {[py38-examples]commands}
50-
py39-examples: {[py38-examples]commands}
47+
py3{8,9}-examples: {[py38-examples]commands}
5148
examples_aaa: {[examples_aaa]commands}
5249
install: {[install]commands}
5350
lint: make lint
@@ -63,7 +60,6 @@ whitelist_externals =
6360
diff
6461
make
6562

66-
6763
# --- Env commands ---
6864

6965
[install]
@@ -84,7 +80,7 @@ commands =
8480
examples/bad/test_aaa06.py
8581

8682
[py38-examples]
87-
# Add extra checks on Python 3.8 files
83+
# Add extra checks on Python 3.8 (and later) files
8884
commands =
8985
make lintexamplespy38
9086
pytest examples/good_py38/test_assignment_operator.py
@@ -99,7 +95,6 @@ commands =
9995

10096
[gh-actions]
10197
python =
102-
3.6: py36
10398
3.7: py37
10499
3.8: py38
105100
3.9: py39

0 commit comments

Comments
 (0)