diff options
| -rw-r--r-- | doc-requirements.txt | 2 | ||||
| -rw-r--r-- | docs/contributing.md | 1 | ||||
| -rw-r--r-- | qa/base.py | 3 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 15 |
6 files changed, 16 insertions, 9 deletions
diff --git a/doc-requirements.txt b/doc-requirements.txt index 9e47a54..bc7615c 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -1 +1 @@ -mkdocs==0.14.0
\ No newline at end of file +mkdocs==0.16.0
\ No newline at end of file diff --git a/docs/contributing.md b/docs/contributing.md index 00384c5..177df8e 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -59,3 +59,4 @@ mkdocs serve ``` Then access the documentation website on your host machine on [http://localhost:8000](). +Note that this is only supported for python >= 2.7. @@ -41,6 +41,9 @@ class BaseTestCase(TestCase): touch(test_filename, _cwd=self.tmp_git_repo) git("add", test_filename, _cwd=self.tmp_git_repo) # https://amoffat.github.io/sh/#interactive-callbacks + if not ok_code: + ok_code = [0] + git("commit", "-m", message, _cwd=self.tmp_git_repo, _tty_in=True, _out=out, _ok_code=ok_code, _env=environment) return test_filename diff --git a/requirements.txt b/requirements.txt index 884fb3f..830b530 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ setuptools wheel==0.24.0 -Click==5.1 +Click==6.6 sh==1.11 ordereddict==1.1 importlib==1.0.3; python_version < '2.7'
\ No newline at end of file @@ -57,7 +57,7 @@ setup( "License :: OSI Approved :: MIT License" ], install_requires=[ - 'Click==5.1', + 'Click==6.6', 'sh==1.11', 'ordereddict==1.1', ], diff --git a/test-requirements.txt b/test-requirements.txt index 923580d..b0a80c3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,10 +1,13 @@ discover==0.4.0 # support for python 2.6 unittest2==1.1.0 # support for python 2.6 -flake8==2.4.0 +flake8==2.6.2; python_version < '2.7' +flake8==3.2.1; python_version >= '2.7' coverage==3.7.1 -python-coveralls==2.5.0 -radon==1.2.1 -mock==1.3.0 -pytest==2.9.1 -pylint==1.5.5 +python-coveralls==2.9.0 +radon==1.4.2 +mock==2.0.0 +pytest==3.0.4 +pylint<1.4; python_version < '2.7' +astroid<=1.3.2; python_version < '2.7' # astroid is a pylint dependency +pylint==1.6.4; python_version >= '2.7' -e .
\ No newline at end of file |