From 7ceb9dace2a89af059ac149fcd1ab4c3e94ce74a Mon Sep 17 00:00:00 2001 From: Preston Landers Date: Sun, 30 Jul 2017 15:21:39 -0500 Subject: [PATCH 1/6] Add `.idea` and `env` to ``.gitignore`. --- .gitignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 29798bb..b2a4044 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,10 @@ pip-log.txt *.mo ## paver generated files -/paver-minilib.zip \ No newline at end of file +/paver-minilib.zip + +## IDEs +.idea + +## Virtual Environments +env From c2d181151647c8ecbcbd3d8c7219540a951110a6 Mon Sep 17 00:00:00 2001 From: Preston Landers Date: Sun, 30 Jul 2017 15:23:56 -0500 Subject: [PATCH 2/6] Add a Python 3 fix to setup.py where it runs flake8. --- setup.py.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py.tpl b/setup.py.tpl index 09b2e04..2043c73 100644 --- a/setup.py.tpl +++ b/setup.py.tpl @@ -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 From f25999d2abcd6bad49507a4b3e578f1c94ab109c Mon Sep 17 00:00:00 2001 From: Preston Landers Date: Sun, 30 Jul 2017 17:52:51 -0500 Subject: [PATCH 3/6] Trying to fix travis build. --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a500217..872196a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,17 @@ language: python -python: 2.7 +python: + - "2.6" + - "2.7" + - "3.4" + - "3.5" + - "3.6" env: - TOXENV=py26 - TOXENV=py27 - TOXENV=py33 + - TOXENV=py34 + - TOXENV=py35 + - TOXENV=py36 - TOXENV=pypy - TOXENV=docs install: From 4373cc6a800e72b9ed0c056c7a24bbf8c14ad330 Mon Sep 17 00:00:00 2001 From: Preston Landers Date: Sun, 30 Jul 2017 17:58:42 -0500 Subject: [PATCH 4/6] Trying to fix travis build again. --- .travis.yml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 872196a..c54d6e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,21 @@ language: python -python: - - "2.6" - - "2.7" - - "3.4" - - "3.5" - - "3.6" -env: - - TOXENV=py26 - - TOXENV=py27 - - TOXENV=py33 - - TOXENV=py34 - - TOXENV=py35 - - TOXENV=py36 - - 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: From 9850bb37c653dafa2f99c7887529bec96f624756 Mon Sep 17 00:00:00 2001 From: Preston Landers Date: Sun, 30 Jul 2017 18:35:29 -0500 Subject: [PATCH 5/6] Trying to fix travis build again again. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 226858b..ec5297a 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ # this directory. [tox] -envlist = py26,py27,py33,pypy,docs +envlist = py26,py27,py34,py35,py36,pypy,docs [testenv] deps = From 9228c3544a8da886a73b54de809474e4b2a7672b Mon Sep 17 00:00:00 2001 From: Preston Landers Date: Sun, 30 Jul 2017 15:36:25 -0500 Subject: [PATCH 6/6] Requirements packages updates. (cherry picked from commit 4068381) --- requirements-dev.txt | 28 ++++++++++++++-------------- requirements.txt | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 898ab65..4c89cef 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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 diff --git a/requirements.txt b/requirements.txt index 5c4a1f9..031d243 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ # Python 2.6 compatibility -# argparse==1.2.1 +# argparse==1.4.0