Skip to content
This repository was archived by the owner on Nov 3, 2023. It is now read-only.

Commit c20721b

Browse files
tjanezNurdok
authored andcommitted
Drop support for Python 3.4 and remove unsupported Python versions leftovers (#402)
* Remove PyPy leftovers PyPy support was removed in version 4.0.0. * Remove Python 2 leftovers Python 2.7 support was removed in version 4.0.0, and older Python 2 versions long before that. * Drop support for Python 3.4 Python 3.4 has reached end-of-life and has been retired in Mar 2019: https://www.python.org/dev/peps/pep-0429/. * Drop requirements on packages providing backports for older Pythons
1 parent 485888a commit c20721b

File tree

13 files changed

+14
-90
lines changed

13 files changed

+14
-90
lines changed

.appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
environment:
22
matrix:
3-
- TOXENV: "py34-tests"
43
- TOXENV: "py35-tests"
54
- TOXENV: "py36-tests"
65
- TOXENV: "py37-tests"
7-
- TOXENV: "py34-install"
86
- TOXENV: "py35-install"
97
- TOXENV: "py36-install"
108
- TOXENV: "py37-install"

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ install: pip install tox
99
script: tox
1010
matrix:
1111
include:
12-
- python: 3.4
13-
env: TOXENV=py34-tests
1412
- python: 3.5
1513
env: TOXENV=py35-tests
1614
- python: 3.6
@@ -19,8 +17,6 @@ matrix:
1917
dist: xenial
2018
sudo: required
2119
env: TOXENV=py37-tests
22-
- python: 3.4
23-
env: TOXENV=py34-install
2420
- python: 3.5
2521
env: TOXENV=py35-install
2622
- python: 3.6

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ docstring conventions.
2323
`PEP 257 <http://www.python.org/dev/peps/pep-0257/>`_ out of the box, but it
2424
should not be considered a reference implementation.
2525

26-
**pydocstyle** supports Python 3.4, 3.5, 3.6 and 3.7.
26+
**pydocstyle** supports Python 3.5, 3.6 and 3.7.
2727

2828

2929
Quick Start

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ docstring conventions.
88
`PEP 257 <http://www.python.org/dev/peps/pep-0257/>`_ out of the box, but it
99
should not be considered a reference implementation.
1010

11-
**pydocstyle** supports Python 3.4, 3.5, 3.6, 3.7, and pypy.
11+
**pydocstyle** supports Python 3.5, 3.6, and 3.7.
1212

1313

1414
.. include:: quickstart.rst

docs/release_notes.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Release Notes
77
Current Development Version
88
---------------------------
99

10+
Major Updates
11+
12+
* Support for Python 3.4 has been dropped (#402).
13+
1014
New Features
1115

1216
* Extend support for detecting missing arguments in Google style

requirements/runtime.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
snowballstemmer==1.2.1
2-
configparser==3.5.0

requirements/tests.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
pytest==3.0.2
22
pytest-pep8==1.0.6
3-
mock==2.0.0
4-
pathlib
53
mypy==0.630
6-
six
7-
typing

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__ import with_statement
21
from setuptools import setup
32
import sys
43

@@ -25,14 +24,13 @@
2524
'Environment :: Console',
2625
'Development Status :: 5 - Production/Stable',
2726
'Programming Language :: Python :: 3',
28-
'Programming Language :: Python :: 3.4',
2927
'Programming Language :: Python :: 3.5',
3028
'Programming Language :: Python :: 3.6',
3129
'Programming Language :: Python :: 3.7',
3230
'Operating System :: OS Independent',
3331
'License :: OSI Approved :: MIT License',
3432
],
35-
python_requires='>=3.4',
33+
python_requires='>=3.5',
3634
keywords='pydocstyle, PEP 257, pep257, PEP 8, pep8, docstrings',
3735
packages=('pydocstyle',),
3836
package_dir={'': 'src'},

src/pydocstyle/config.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
import itertools
55
import os
66
from collections import namedtuple
7+
from collections.abc import Set
78
from re import compile as re
89
from configparser import RawConfigParser
910

1011
from .utils import __version__, log
1112
from .violations import ErrorRegistry, conventions
1213

13-
try:
14-
from collections.abc import Set
15-
except ImportError:
16-
# python 2.7
17-
from collections import Set
18-
1914

2015
def check_initialized(method):
2116
"""Check that the configuration object was initialized."""

src/tests/parser_test.py

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Parser tests."""
22

33
import io
4-
import six
54
import sys
65
import pytest
76
import textwrap
@@ -434,8 +433,6 @@ def test_raise_from():
434433

435434
def test_simple_matrix_multiplication():
436435
"""Make sure 'a @ b' doesn't trip the parser."""
437-
if sys.version_info.minor < 5:
438-
return
439436
parser = Parser()
440437
code = CodeSnippet("""
441438
def foo():
@@ -446,8 +443,6 @@ def foo():
446443

447444
def test_matrix_multiplication_with_decorators():
448445
"""Make sure 'a @ b' doesn't trip the parser."""
449-
if sys.version_info.minor < 5:
450-
return
451446
parser = Parser()
452447
code = CodeSnippet("""
453448
def foo():
@@ -608,13 +603,10 @@ def test_single_value_dunder_all():
608603
foo = 'foo'
609604
__all__ = [foo]
610605
"""),
606+
CodeSnippet("""\
607+
__all__ = (*foo, 'bar')
608+
"""),
611609
]
612-
if six.PY3 and not six.PY34:
613-
indeterminable_dunder_all_test_cases += [
614-
CodeSnippet("""\
615-
__all__ = (*foo, 'bar')
616-
"""),
617-
]
618610

619611

620612
@pytest.mark.parametrize("code", indeterminable_dunder_all_test_cases)
@@ -655,16 +647,6 @@ def test_indeterminable_dunder_all(code):
655647
from __future__ \\
656648
import nested_scopes
657649
"""),
658-
659-
# The following code snippet fails for PyPy, see:
660-
# "Future statements are considered illegal if they are separated
661-
# by a semicolon"
662-
# https://bitbucket.org/pypy/pypy/issues/2526/
663-
664-
# CodeSnippet("""\
665-
# from __future__ import unicode_literals; from __future__ import \
666-
# nested_scopes
667-
# """),
668650
))
669651
def test_future_import(code):
670652
"""Test that __future__ imports are properly parsed and collected."""

0 commit comments

Comments
 (0)