Skip to content

Commit

Permalink
Merge pull request #5348 from hypothesis/remove-tox-pip-extensions
Browse files Browse the repository at this point in the history
Remove tox-pip-extensions
  • Loading branch information
seanh committed Oct 5, 2018
2 parents 94e1059 + 73b50ad commit 3d19f0d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ matrix:
postgresql: "9.4"
before_install:
- ./scripts/elasticsearch.sh
install: pip install tox==3.3.0 tox-pip-extensions
install: pip install tox
before_script: createdb htest
script: tox
after_success:
Expand All @@ -24,7 +24,7 @@ matrix:
postgresql: '9.4'
before_install:
- ./scripts/elasticsearch.sh
install: pip install tox==3.3.0 tox-pip-extensions
install: pip install tox
before_script: createdb htest
script:
make test-py3
Expand All @@ -50,15 +50,15 @@ matrix:
- env: ACTION=backend-lint
language: python
python: '3.6'
install: pip install tox==3.3.0 tox-pip-extensions
install: pip install tox
script:
make lint

# Check the docs build for warnings or errors.
- env: ACTION=check-docs
language: python
python: '3.6'
install: pip install tox==3.3.0 tox-pip-extensions
install: pip install tox
script:
make checkdocs

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ node {
// Test dependencies
sh 'apk add --no-cache build-base libffi-dev postgresql-dev python-dev'
sh 'apk add --no-cache python3 python3-dev'
sh 'pip install -q tox==3.3.0 tox-pip-extensions'
sh 'pip install -q tox'

// Unit tests
sh 'cd /var/lib/hypothesis && tox'
Expand Down
9 changes: 5 additions & 4 deletions docs/developing/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ Install node by following the
(the version of the nodejs package in the standard Ubuntu repositories is too
old).

Upgrade pip and npm, and install tox and tox-pip-extensions:
Upgrade pip and npm, and install tox:

.. code-block:: bash
sudo pip install -U pip tox tox-pip-extensions
sudo pip install -U pip tox
sudo npm install -g npm
Installing the system dependencies on macOS
-------------------------------------------

Expand All @@ -76,11 +77,11 @@ Install the following packages:
.. note:: Unfortunately you need to install the ``postgresql`` package, because
Homebrew does not currently provide a standalone ``libpq`` package.

Upgrade pip and install tox and tox-pip-extensions:
Upgrade pip and install tox:

.. code-block:: bash
pip install -U pip tox tox-pip-extensions
pip install -U pip tox
Getting the h source code from GitHub
Expand Down
3 changes: 0 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[tox]
envlist = py27
skipsdist = true
requires =
tox-pip-extensions
tox_pip_extensions_ext_venv_update = true

[pytest]
minversion = 2.8
Expand Down

0 comments on commit 3d19f0d

Please sign in to comment.