Merge pull request #1173 from dstufft/use-tox

Configure Tox and Use It to Drive Travis

Author: dstufft

.travis.yml

@@ -1,27 +1,28 @@
 language: python
-python:
-  - 2.6
-  - 2.7
-  - 3.2
-  - 3.3
-  - pypy
-before_install:
-    - sudo apt-get install subversion bzr mercurial
-    - echo -e "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> ~/.hgrc
-    - git config --global user.email "[email protected]"
-    - git config --global user.name "Pip"
+
+env:
+  - TOXENV=collect
+  - TOXENV=docs
+  - TOXENV=py26
+  - TOXENV=py27
+  - TOXENV=py32
+  - TOXENV=py33
+  - TOXENV=pypy
+
 install:
-  - pip install --upgrade setuptools
-  - pip install pytest pytest-xdist git+https://github.com/pypa/virtualenv@develop#egg=virtualenv scripttest>=1.3 mock
-script:
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then py.test -v; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then py.test -v -n 8; fi"
-notifications:
-  irc: "irc.freenode.org#pip"
+  - sudo apt-get install subversion bzr mercurial
+  - echo -e "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> ~/.hgrc
+  - git config --global user.email "[email protected]"
+  - git config --global user.name "Pip"
+  - pip install tox
+
+script: tox
+
 branches:
   only:
     - develop
     - 1.3.X
     - 1.4.X
-env:
-  - PYTHONHASHSEED=0
+
+notifications:
+  irc: "irc.freenode.org#pip"

docs/development.rst

@@ -29,12 +29,15 @@ Running tests
 
 OS Requirements: subversion, bazaar, git, and mercurial.
 
-Python Requirements: pytest, virtualenv, scripttest, and mock
+Python Requirements: tox or pytest, virtualenv, scripttest, and mock
 
 Ways to run the tests locally:
 
 ::
 
+ $ tox -e py33           # The preferred way to run the tests, can use pyNN to
+                         # run for a particular version or leave off the -e to
+                         # run for all versions.
  $ python setup.py test  # Using the setuptools test plugin
  $ py.test               # Using py.test directly
  $ tox                   # Using tox against pip's tox.ini

docs/logic.rst

@@ -105,8 +105,7 @@ files without a hash, or files that are linked from either the home page or the
 download url of a package.
 
 In order to get the future behavior in v1.4 the ``pip install`` command
-supports a :ref:`--no-allow-external <--no-allow-external>` and
-:ref:`--no-allow-insecure <--no-allow-external>` flags.
+supports a ``--no-allow-external`` and ``--no-allow-insecure`` flags.
 
 .. _`VCS Support`:
 

tests/conftest.py

@@ -42,7 +42,7 @@ def virtualenv(tmpdir, monkeypatch):
     pip_src = tmpdir.join("pip_src").abspath
     shutil.copytree(SRC_DIR, pip_src,
         ignore=shutil.ignore_patterns(
-            "*.pyc", "docs/", "tests/", "pip.egg-info",
+            "*.pyc", "tests", "pip.egg-info", "build", "dist", ".tox",
         ),
     )
 

tests/lib/venv.py

@@ -48,16 +48,18 @@ def _create(self, clear=False):
 
         # Install our development version of pip install the virtual
         # environment
+        cmd = [self.location.join("bin", "python"), "setup.py", "develop"]
         p = subprocess.Popen(
-            [self.location.join("bin", "python"), "setup.py", "develop"],
+            cmd,
             cwd=self.pip_source_dir,
             stderr=subprocess.STDOUT,
             stdout=DEVNULL,
         )
         p.communicate()
-
         if p.returncode != 0:
-            raise subprocess.CalledProcessError(p.returncode, p.args)
+            raise subprocess.CalledProcessError(p.returncode, cmd[0],
+                output=p.stdout,
+            )
 
     def clear(self):
         self._create(clear=True)

tox.ini

@@ -1,13 +1,31 @@
 [tox]
 envlist =
-    py26,py27,py32,py33,pypy
+    collect,docs,py26,py27,py32,py33,pypy
 
 [testenv]
-deps=
+deps =
     pytest
+    pytest-xdist
     mock
     scripttest>=1.3
     git+https://github.com/pypa/virtualenv@develop#egg=virtualenv
+commands =
+    py.test -n 8
+
+[testenv:collect]
+commands =
+    py.test --collectonly
+
+[testenv:docs]
+deps = sphinx
+basepython = python2.7
+commands =
+    sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
+
+[testenv:py32]
 commands =
     py.test
 
+[testenv:py33]
+setenv =
+    PYTHONHASHSEED = 0