Jelajahi Sumber

Try some tox stuff

Ask Solem 9 tahun lalu
induk
melakukan
ddfe2bc191
2 mengubah file dengan 25 tambahan dan 58 penghapusan
  1. 6 5
      .travis.yml
  2. 19 53
      tox.ini

+ 6 - 5
.travis.yml

@@ -3,7 +3,8 @@ sudo: false
 cache:
   directories:
     - $HOME/.cache/pip
-python: 2.7
+python:
+    - '3.5'
 env:
   global:
     PYTHONUNBUFFERED=yes
@@ -12,10 +13,10 @@ env:
     - TOXENV=3.3
     - TOXENV=3.4
     - TOXENV=pypy
-install:
-  - pip install tox
-script:
-  - tox -v -- -v
+    - TOXENV=3.5
+    - TOXENV=pypy3
+install: pip install -U tox
+script: tox -v -- -v
 after_success:
   - .tox/$TRAVIS_PYTHON_VERSION/bin/coveralls
 notifications:

+ 19 - 53
tox.ini

@@ -1,65 +1,31 @@
 [tox]
-envlist =
-    2.7,
-    3.3,
-    3.4,
-    pypy,
-    pypy3
+envlist = 2.7,pypy,3.3,3.4,3.5,pypy3
 
 [testenv]
-sitepackages = False
-commands = nosetests
+deps=
+    -r{toxinidir}/requirements/default.txt
 
-[testenv:3.4]
-basepython = python3.4
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-ci-default.txt
-setenv = C_DEBUG_TEST = 1
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+    2.7,pypy: -r{toxinidir}/requirements/test.txt
+    2.7,pypy: -r{toxinidir}/requirements/test-ci-default.txt
 
-[testenv:3.3]
-basepython = python3.3
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-ci-default.txt
-setenv = C_DEBUG_TEST = 1
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+    3.3,3.4,3.5: -r{toxinidir}/requirements/test3.txt
+    3.3,3.4,3.5: -r{toxinidir}/requirements/test-ci-default.txt
 
-[testenv:2.7]
-basepython = python2.7
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test.txt
-       -r{toxinidir}/requirements/test-ci-default.txt
-setenv = C_DEBUG_TEST = 1
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+    pypy3: -r{toxinidir}/requirements/test3.txt
+    pypy3: -r{toxinidir}/requirements/test-pypy3.txt
+    pypy3: -r{toxinidir}/requirements/test-ci-base.txt
 
-[testenv:pypy]
-basepython = pypy
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test.txt
-       -r{toxinidir}/requirements/test-ci-base.txt
-setenv = C_DEBUG_TEST = 1
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -q -U -r{toxinidir}/requirements/dev.txt
-           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
-
-[testenv:pypy3]
-basepython = pypy3
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-pypy3.txt
-       -r{toxinidir}/requirements/test-ci-base.txt
-setenv = C_DEBUG_TEST = 1
+sitepackages = False
+recreate = False
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -q -U -r{toxinidir}/requirements/dev.txt
            nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+basepython =
+    2.7: python2.7
+    3.3: python3.3
+    3.4: python3.4
+    3.5: python3.5
+    pypy: pypy
+    pypy3: pypy3
 
 [testenv:docs]
 deps = -r{toxinidir}/requirements/docs.txt