8000 Merge PR157, PR158 (flake8, tox-travis) · drinkingjava/python-versioneer@c13c96e · GitHub
[go: up one dir, main page]
Skip to content

Commit c13c96e

Browse files
warnerwarner
committed
Merge PR157, PR158 (flake8, tox-travis)
2 parents 92f3dc4 + 227ff43 commit c13c96e

File tree

5 files changed

+13
-24
lines changed

5 files changed

+13
-24
lines changed

‎.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ python:
1717
- "pypy"
1818
- "pypy3"
1919
install:
20-
# virtualenv>=14.0.0 is incompatible with python 3.2
21-
- if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then pip install -U tox virtualenv; else travis_retry pip install tox "virtualenv<14.0.0"; fi
20+
- pip install tox-travis
2221
script:
23-
- tox -e py${TRAVIS_PYTHON_VERSION}
22+
- tox
2423
matrix:
2524
allow_failures:
2625
- python: "pypy3"

‎src/git/long_header.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class NotThisMethod(Exception):
5656

5757

5858
def register_vcs_handler(vcs, method): # decorator
59-
"""Decorator to mark a method as the handler for a particular VCS."""
59+
"""Create decorator to mark a method as the handler of a VCS."""
6060
def decorate(f):
6161
"""Store f in HANDLERS[vcs][method]."""
6262
if vcs not in HANDLERS:

‎src/header.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class NotThisMethod(Exception):
101101

102102

103103
def register_vcs_handler(vcs, method): # decorator
104-
"""Decorator to mark a method as the handler for a particular VCS."""
104+
"""Create decorator to mark a method as the handler of a VCS."""
105105
def decorate(f):
106106
"""Store f in HANDLERS[vcs][method]."""
107107
if vcs not in HANDLERS:

‎src/setupfunc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def do_vcs_install(): pass # --STRIP DURING BUILD
5252

5353

5454
def do_setup():
55-
"""Main VCS-independent setup function for installing Versioneer."""
55+
"""Do main VCS-independent setup function for installing Versioneer."""
5656
root = get_root()
5757
try:
5858
cfg = get_config_from_root(root)

‎tox.ini

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,25 @@
33
# test suite on all supported python versions. To use it, "pip install tox"
44
# and then run "tox" from this directory.
55

6-
# env names corresponding to py${TRAVIS_PYTHON_VERSION}, see .travis.yml
76
[tox]
8-
envlist = py2.6,py2.7,py3.2,py3.3,py3.4,py3.5,py3.6,pypypy,pypypy3
7+
envlist = py26,py27,py32,py33,py34,py35,py36,pypy,pypy3
98
skip_missing_interpreters = True
109

1110
[testenv]
12-
basepython =
13-
py2.6: python2.6
14-
py2.7: python2.7
15-
py3.2: python3.2
16-
py3.3: python3.3
17-
py3.4: python3.4
18-
py3.5: python3.5
19-
py3.6: python3.6
20-
pypypy: pypy
21-
pypypy3: pypy3
22-
2311
# virtualenv>=14.0.0 is incompatible with python 3.2
2412
# flake8>=3.0.0 is incompatible with 2.6,3.2,3.3
2513
deps =
2614
pyflakes
27-
py2.6,py3.2,py3.3: flake8<3.0.0
28-
py2.7,py3.4,py3.5,py3.6,pypypy,pypypy3: flake8
15+
py26,py32,py33: flake8<3.0.0
16+
py27,py34,py35,py36,pypy,pypy3: flake8
17+
py26,py32: pydocstyle<2
18+
py26,py32: flake8-docstrings<1.1.0
19+
py27,py33,py34,py35,py36,pypy,pypy3: flake8-docstrings
2920
wheel
3021
setuptools
31-
py3.2: virtualenv<14.0.0
32-
py2.6,py2.7,py3.3,py3.4,py3.5,py3.6,pypypy,pypypy3: virtualenv
22+
py32: virtualenv<14.0.0
23+
py26,py27,py33,py34,py35,py36,pypy,pypy3: virtualenv
3324
discover
34-
flake8-docstrings
3525
pep8
3626

3727
commands =

0 commit comments

Comments
 (0)
0