Skip to content

Merge pull request #11533 from tacaswell/update_for_py37 #11817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python

dist: trusty
dist: xenial
sudo: false

branches:
Expand Down Expand Up @@ -87,6 +87,8 @@ matrix:
env: PYTHON_ARGS=-OO
- python: 3.6
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
- python: 3.7
sudo: true
- python: "nightly"
env: PRE=--pre
- os: osx
Expand Down
6 changes: 3 additions & 3 deletions doc/devel/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ Using tox
`Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running
tests against
multiple Python environments, including multiple versions of Python
(e.g., 2.7, 3.4, 3.5) and even different Python implementations
(e.g., 2.7, 3.5, 3.6) and even different Python implementations
altogether (e.g., CPython, PyPy, Jython, etc.)

Testing all versions of Python (2.6, 2.7, 3.*) requires
Testing all versions of Python (2.7, 3.6, 3.7, ...) requires
having multiple versions of Python installed on your system and on the
PATH. Depending on your operating system, you may want to use your
package manager (such as apt-get, yum or MacPorts) to do this.
Expand All @@ -284,7 +284,7 @@ You can also run tox on a subset of environments:

.. code-block:: bash

$ tox -e py26,py27
$ tox -e py27,py36,py37

Tox processes everything serially so it can take a long time to test
several environments. To speed it up, you might try using a new,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading