Skip to content

Commit 292fb86

Browse files
committed
Merge pull request #11533 from tacaswell/update_for_py37
MNT: updates for python 3.7 Conflicts: .travis.yml - mostly keep 2.2.x version, but add py37 section INSTALL.rst - kept v2.2.x wording lib/matplotlib/tests/test_figure.py - removed non-existent on 2.2.x test (feature tested is only on master)
1 parent 00daa8f commit 292fb86

File tree

4 files changed

+238
-229
lines changed

4 files changed

+238
-229
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: python
22

3-
dist: trusty
3+
dist: xenial
44
sudo: false
55

66
branches:
@@ -87,6 +87,8 @@ matrix:
8787
env: PYTHON_ARGS=-OO
8888
- python: 3.6
8989
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
90+
- python: 3.7
91+
sudo: true
9092
- python: "nightly"
9193
env: PRE=--pre
9294
- os: osx

doc/devel/testing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ Using tox
264264
`Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running
265265
tests against
266266
multiple Python environments, including multiple versions of Python
267-
(e.g., 2.7, 3.4, 3.5) and even different Python implementations
267+
(e.g., 3.5, 3.6) and even different Python implementations
268268
altogether (e.g., CPython, PyPy, Jython, etc.)
269269

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

285285
.. code-block:: bash
286286
287-
$ tox -e py26,py27
287+
$ tox -e py36,py37
288288
289289
Tox processes everything serially so it can take a long time to test
290290
several environments. To speed it up, you might try using a new,

0 commit comments

Comments
 (0)