From 9cca567bede872ad3383683478f0994576bb8ad5 Mon Sep 17 00:00:00 2001 From: derwinlu Date: Mon, 23 Jan 2017 23:45:08 +0100 Subject: [PATCH] Add python3.6 test environment * Add py36 environment to tox * Unify dependencies across manual installation and tox * Mention tox in the docs --- docs/contribute.rst | 5 ++++- requirements/developer.pip | 7 ++----- requirements/docs.pip | 2 ++ requirements/style.pip | 2 ++ tox.ini | 11 +++++------ 5 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 requirements/docs.pip create mode 100644 requirements/style.pip diff --git a/docs/contribute.rst b/docs/contribute.rst index 0ed82dfd..1fdc8212 100644 --- a/docs/contribute.rst +++ b/docs/contribute.rst @@ -47,13 +47,16 @@ Or using ``pip``:: $ pip install -e . +To conveniently test vs multiple python versions we also provide a tox file. + + Building the docs ================= If you make changes to the documentation, you should preview your changes before committing them:: - $ pip install sphinx + $ pip install -r requirements/docs.pip $ cd src/pelican/docs $ make html diff --git a/requirements/developer.pip b/requirements/developer.pip index e5507151..5c2f5a69 100644 --- a/requirements/developer.pip +++ b/requirements/developer.pip @@ -1,6 +1,3 @@ -r test.pip - -# Development -flake8 -flake8-import-order -sphinx==1.4.9 +-r docs.pip +-r style.pip diff --git a/requirements/docs.pip b/requirements/docs.pip new file mode 100644 index 00000000..525bdc40 --- /dev/null +++ b/requirements/docs.pip @@ -0,0 +1,2 @@ +sphinx==1.4.9 +sphinx_rtd_theme diff --git a/requirements/style.pip b/requirements/style.pip new file mode 100644 index 00000000..90225d01 --- /dev/null +++ b/requirements/style.pip @@ -0,0 +1,2 @@ +flake8 +flake8-import-order diff --git a/tox.ini b/tox.ini index cb400ea7..95cd5273 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27,33,34,35},docs,flake8 +envlist = py{27,33,34,35,36},docs,flake8 [testenv] basepython = @@ -7,10 +7,11 @@ basepython = py33: python3.3 py34: python3.4 py35: python3.5 + py36: python3.6 passenv = * usedevelop=True deps = - -rrequirements/developer.pip + -rrequirements/test.pip nose nose-cov coveralls @@ -24,8 +25,7 @@ commands = [testenv:docs] basepython = python2.7 deps = - sphinx==1.4.9 - sphinx_rtd_theme + -rrequirements/docs.pip changedir = docs commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html @@ -37,8 +37,7 @@ import-order-style = cryptography [testenv:flake8] basepython = python2.7 deps = - flake8 <= 2.4.1 - git+https://github.com/public/flake8-import-order@2ac7052a4e02b4a8a0125a106d87465a3b9fd688 + -rrequirements/style.pip commands = flake8 --version flake8 pelican