Skip to content

MNT: drop 3.5 testing for 3.1 branch #12538

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.

Sign up for GitHub

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 5 commits into from
Dec 5, 2018
Merged

MNT: drop 3.5 testing for 3.1 branch #12538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09ce51d
MNT: remove py 3.5 from testing
jklymak Dec 3, 2018
b045ff2
MNT: add circleci37
jklymak Dec 4, 2018
6a6f414
MNT: remove trvis35.txt
jklymak Dec 4, 2018
2bb34e5
Update config.yml
tacaswell Dec 4, 2018
85eef19
MNT: fix test version check
jklymak Dec 4, 2018
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
3 changes: 0 additions & 3 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ environment:
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
# one for 64bit because we construct envs anyway. But using one for the
# right python version is hopefully making it fast due to package caching.
- PYTHON_VERSION: "3.5"
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
TEST_ALL: "no"
- PYTHON_VERSION: "3.6"
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
TEST_ALL: "no"
Expand Down
33 changes: 14 additions & 19 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ jobs:
- run: *apt-install
- run: *fonts-install
- run: *pip-install

- run: *deps-install
- run:
<<: *deps-install
environment:
NUMPY_VERSION: "==1.11.0"
- run: *mpl-install

- run: *doc-build
Expand All @@ -114,34 +116,21 @@ jobs:
name: "Built documentation is available at:"
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"

- add_ssh_keys:
fingerprints:
- "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
- deploy:
name: "Deploy new docs"
command: ./.circleci/deploy-docs.sh

docs-python35:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's move to a 3.7 docker build, and pin numpy 1.11 on the 3.6 build?
The CircleCI build does complement the coverage of the test suite.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely, but does doing it on 3.6 and 3.7 buy us that much?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test with oldest numpy (1.11) on 3.6, latest on 3.7.

docs-python37:
docker:
- image: circleci/python:3.5
- image: circleci/python:3.7
steps:
- checkout

- run: *apt-install
- run: *fonts-install
- run: *pip-install

- run:
<<: *deps-install
environment:
NUMPY_VERSION: "==1.11.0"
- run: *deps-install
- run: *mpl-install

- run: *doc-build

# We don't build the LaTeX docs here, so linkchecker will complain
- run: touch doc/build/html/Matplotlib.pdf

- run: *doc-bundle
- store_artifacts:
path: doc/build/sphinx-gallery-files.tar.gz
Expand All @@ -153,6 +142,12 @@ jobs:
name: "Built documentation is available at:"
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"

- add_ssh_keys:
fingerprints:
- "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
- deploy:
name: "Deploy new docs"
command: ./.circleci/deploy-docs.sh

#########################################
# Defining workflows gets us parallelism.
Expand All @@ -162,5 +157,5 @@ workflows:
version: 2
build:
jobs:
- docs-python35
- docs-python36
- docs-python37
6 changes: 1 addition & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,9 @@ matrix:
- RUN_PYTEST=
- RUN_FLAKE8=1
- EXTRAREQS='-r requirements/testing/travis_flake8.txt'
- python: 3.5
dist: trusty
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
env:
- PINNEDVERS='-c requirements/testing/travis35.txt'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also remove this file (or rename it to be the 3.6 pins).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were pinning numpy to 1.10 on the other builds?

Copy link
Member Author

@jklymak jklymak Oct 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the Travis 3.6 build was getting reqs from travis_all.txt, so I think this is OK... Oh duh, I see we need to make sure one of the tests tests the minimums. OK. Thats a bit more work.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, see new file. I'm not sure if the other pinned reqs in travis35.txt were required to get it to run on 3.5 or if they were min deps we were wanting to test. I suspect the former, so I removed them.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pytest and sphinx are pinned as minimum deps also.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is that? Are we testing that devs can use old Sphinx and pytest? Or are those user facing pins?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose so; those are the versions we specify in the docs.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, - wasn't sure if w need the pin on pytest-timeout so trying w/o

- python: 3.6
env:
- PINNEDVERS='-c requirements/testing/travis36minver.txt'
- DELETE_FONT_CACHE=1
- EXTRAREQS='-r requirements/testing/travis36.txt'
- python: 3.7
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Dependencies

Matplotlib requires the following dependencies:

* `Python <https://www.python.org/downloads/>`_ (>= 3.5)
* `Python <https://www.python.org/downloads/>`_ (>= 3.6)
* `FreeType <https://www.freetype.org/>`_ (>= 2.3)
* `libpng <http://www.libpng.org>`_ (>= 1.2)
* `NumPy <http://www.numpy.org>`_ (>= 1.11)
Expand Down
2 changes: 0 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jobs:
vmImage: 'Ubuntu 16.04'
strategy:
matrix:
Python35:
python.version: '3.5'
Python36:
python.version: '3.6'
Python37:
Expand Down
7 changes: 3 additions & 4 deletions lib/matplotlib/tests/test_animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import sys

import numpy as np
from pathlib import Path
import pytest

import matplotlib as mpl
Expand Down Expand Up @@ -123,10 +124,8 @@ def isAvailable(cls):
('html', 'movie.html'),
('null', 'movie.null')
]
if sys.version_info >= (3, 6):
from pathlib import Path
WRITER_OUTPUT += [
(writer, Path(output)) for writer, output in WRITER_OUTPUT]
WRITER_OUTPUT += [
(writer, Path(output)) for writer, output in WRITER_OUTPUT]


# Smoke test for saving animations. In the future, we should probably
Expand Down
12 changes: 0 additions & 12 deletions requirements/testing/travis35.txt
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions requirements/testing/travis36minver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Extra pip requirements for the first travis python 3.6 build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to delete travis35.txt no?


cycler==0.10
python-dateutil==2.1
numpy==1.11.0
pyparsing==2.0.1