Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e2045c3

Browse filesBrowse files
tacaswelltacaswell
authored
Merge pull request #12538 from jklymak/mnt-drop35-travis
API: drop 3.5 testing for 3.1 branch
2 parents 73c3dce + 85eef19 commit e2045c3
Copy full SHA for e2045c3

File tree

Expand file treeCollapse file tree

8 files changed

+25
-46
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+25
-46
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ environment:
2121
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
2222
# one for 64bit because we construct envs anyway. But using one for the
2323
# right python version is hopefully making it fast due to package caching.
24-
- PYTHON_VERSION: "3.5"
25-
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
26-
TEST_ALL: "no"
2724
- PYTHON_VERSION: "3.6"
2825
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
2926
TEST_ALL: "no"

‎.circleci/config.yml

Copy file name to clipboardExpand all lines: .circleci/config.yml
+14-19Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ jobs:
9797
- run: *apt-install
9898
- run: *fonts-install
9999
- run: *pip-install
100-
101-
- run: *deps-install
100+
- run:
101+
<<: *deps-install
102+
environment:
103+
NUMPY_VERSION: "==1.11.0"
102104
- run: *mpl-install
103105

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

117-
- add_ssh_keys:
118-
fingerprints:
119-
- "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
120-
- deploy:
121-
name: "Deploy new docs"
122-
command: ./.circleci/deploy-docs.sh
123-
124-
docs-python35:
119+
docs-python37:
125120
docker:
126-
- image: circleci/python:3.5
121+
- image: circleci/python:3.7
127122
steps:
128123
- checkout
129124

130125
- run: *apt-install
131126
- run: *fonts-install
132127
- run: *pip-install
133128

134-
- run:
135-
<<: *deps-install
136-
environment:
137-
NUMPY_VERSION: "==1.11.0"
129+
- run: *deps-install
138130
- run: *mpl-install
139131

140132
- run: *doc-build
141133

142-
# We don't build the LaTeX docs here, so linkchecker will complain
143-
- run: touch doc/build/html/Matplotlib.pdf
144-
145134
- run: *doc-bundle
146135
- store_artifacts:
147136
path: doc/build/sphinx-gallery-files.tar.gz
@@ -153,6 +142,12 @@ jobs:
153142
name: "Built documentation is available at:"
154143
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
155144

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

157152
#########################################
158153
# Defining workflows gets us parallelism.
@@ -162,5 +157,5 @@ workflows:
162157
version: 2
163158
build:
164159
jobs:
165-
- docs-python35
166160
- docs-python36
161+
- docs-python37

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,9 @@ matrix:
7575
- RUN_PYTEST=
7676
- RUN_FLAKE8=1
7777
- EXTRAREQS='-r requirements/testing/travis_flake8.txt'
78-
- python: 3.5
79-
dist: trusty
80-
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
81-
env:
82-
- PINNEDVERS='-c requirements/testing/travis35.txt'
8378
- python: 3.6
8479
env:
80+
- PINNEDVERS='-c requirements/testing/travis36minver.txt'
8581
- DELETE_FONT_CACHE=1
8682
- EXTRAREQS='-r requirements/testing/travis36.txt'
8783
- python: 3.7

‎INSTALL.rst

Copy file name to clipboardExpand all lines: INSTALL.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Dependencies
133133

134134
Matplotlib requires the following dependencies:
135135

136-
* `Python <https://www.python.org/downloads/>`_ (>= 3.5)
136+
* `Python <https://www.python.org/downloads/>`_ (>= 3.6)
137137
* `FreeType <https://www.freetype.org/>`_ (>= 2.3)
138138
* `libpng <http://www.libpng.org>`_ (>= 1.2)
139139
* `NumPy <http://www.numpy.org>`_ (>= 1.11)

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
vmImage: 'Ubuntu 16.04'
1111
strategy:
1212
matrix:
13-
Python35:
14-
python.version: '3.5'
1513
Python36:
1614
python.version: '3.6'
1715
Python37:

‎lib/matplotlib/tests/test_animation.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_animation.py
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import sys
55

66
import numpy as np
7+
from pathlib import Path
78
import pytest
89

910
import matplotlib as mpl
@@ -123,10 +124,8 @@ def isAvailable(cls):
123124
('html', 'movie.html'),
124125
('null', 'movie.null')
125126
]
126-
if sys.version_info >= (3, 6):
127-
from pathlib import Path
128-
WRITER_OUTPUT += [
129-
(writer, Path(output)) for writer, output in WRITER_OUTPUT]
127+
WRITER_OUTPUT += [
128+
(writer, Path(output)) for writer, output in WRITER_OUTPUT]
130129

131130

132131
# Smoke test for saving animations. In the future, we should probably

‎requirements/testing/travis35.txt

Copy file name to clipboardExpand all lines: requirements/testing/travis35.txt
-12Lines changed: 0 additions & 12 deletions
This file was deleted.

‎requirements/testing/travis36minver.txt

Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Extra pip requirements for the first travis python 3.6 build
2+
3+
cycler==0.10
4+
python-dateutil==2.1
5+
numpy==1.11.0
6+
pyparsing==2.0.1

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.