Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,10 @@ pip-log.txt
*.mo

## paver generated files
/paver-minilib.zip
/paver-minilib.zip

## IDEs
.idea

## Virtual Environments
env
24 changes: 17 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
language: python
python: 2.7
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py33
- TOXENV=pypy
- TOXENV=docs
matrix:
include:
- python: 2.6
env: TOXENV=py26
- python: 2.7
env: TOXENV=py27
- python: 2.7
env: TOXENV=docs
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: 3.6
env: TOXENV=docs

install:
- pip install tox
before_script:
Expand Down
28 changes: 14 additions & 14 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
--requirement requirements.txt

# Testing
pytest==2.5.1
py==1.4.19
mock==1.0.1
pytest==3.1.3
py==1.4.34
mock==2.0.0

# Linting
flake8==2.1.0
mccabe==0.2.1
pep8==1.4.6
pyflakes==0.7.3
flake8==3.4.1
mccabe==0.6.1
pep8==1.7.0
pyflakes==1.5.0

# Documentation
Sphinx==1.2
docutils==0.11
Jinja2==2.7.1
MarkupSafe==0.18
Pygments==1.6
Sphinx==1.6.3
docutils==0.14rc2
Jinja2==2.9.6
MarkupSafe==1.0
Pygments==2.2.0

# Miscellaneous
Paver==1.2.1
colorama==0.2.7
Paver==1.2.4
colorama==0.3.9
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Python 2.6 compatibility
# argparse==1.2.1
# argparse==1.4.0
5 changes: 3 additions & 2 deletions setup.py.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,9 @@ def _lint():
# to pass a byte string to endswith.
project_python_files = [filename for filename in get_project_files()
if filename.endswith(b'.py')]
retcode = subprocess.call(
['flake8', '--max-complexity=10'] + project_python_files)
call_args = [b'flake8', b'--max-complexity=10'] + project_python_files
call_args = list(map(bytes.decode, call_args))
retcode = subprocess.call(call_args)
if retcode == 0:
print_success_message('No style errors')
return retcode
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# this directory.

[tox]
envlist = py26,py27,py33,pypy,docs
envlist = py26,py27,py34,py35,py36,pypy,docs

[testenv]
deps =
Expand Down