diff options
| author | Anthony Sottile <asottile@umich.edu> | 2020-10-02 23:51:02 +0000 |
|---|---|---|
| committer | Anthony Sottile <asottile@umich.edu> | 2020-10-02 23:51:02 +0000 |
| commit | 0f9a4b7606fa8120c7df8f634b87a8bea41fb385 (patch) | |
| tree | 4a0a2e641dd3f1cd38262a942fb5012279f70bb3 | |
| parent | 0efbb5dbcb481c020c92066c550961e21178d0d3 (diff) | |
| parent | a021df6fdda7134daede79cf478786a5533c5dc9 (diff) | |
| download | flake8-0f9a4b7606fa8120c7df8f634b87a8bea41fb385.tar.gz | |
Merge branch 'drop_py34' into 'master'
drop python3.4
See merge request pycqa/flake8!457
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | dev-requirements.txt | 2 | ||||
| -rw-r--r-- | setup.cfg | 3 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 2 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73a1057..0ee5ccf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,11 +28,6 @@ python2: stage: test script: tox -e py27 -python34: - image: python:3.4 - stage: test - script: tox -e py34 - python35: image: python:3.5 stage: test diff --git a/.travis.yml b/.travis.yml index 572bc42..36d1a6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ matrix: include: - python: 2.7 env: TOXENV=py27 - - python: 3.4 - env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 diff --git a/dev-requirements.txt b/dev-requirements.txt index 3ab2397..053148f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1 @@ -# https://github.com/pypa/virtualenv/issues/1963 -virtualenv!=20.0.32;python_version=="3.4" tox @@ -23,7 +23,6 @@ classifiers = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -50,7 +49,7 @@ install_requires= functools32; python_version<"3.2" importlib-metadata; python_version<"3.8" -python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.* +python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* [options.packages.find] where = src @@ -1,6 +1,6 @@ [tox] minversion=2.3.1 -envlist = py27,py34,py35,py36,py37,py38,flake8,linters,docs +envlist = py27,py35,py36,py37,py38,flake8,linters,docs [testenv] deps = |
