File tree 5 files changed +2
-45
lines changed
5 files changed +2
-45
lines changed Original file line number Diff line number Diff line change @@ -21,9 +21,6 @@ environment:
21
21
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
22
22
# one for 64bit because we construct envs anyway. But using one for the
23
23
# 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"
27
24
- PYTHON_VERSION : " 3.6"
28
25
CONDA_INSTALL_LOCN : " C:\\ Miniconda36-x64"
29
26
TEST_ALL : " no"
Original file line number Diff line number Diff line change @@ -121,39 +121,6 @@ jobs:
121
121
name : " Deploy new docs"
122
122
command : ./.circleci/deploy-docs.sh
123
123
124
- docs-python35 :
125
- docker :
126
- - image : circleci/python:3.5
127
- steps :
128
- - checkout
129
-
130
- - run : *apt-install
131
- - run : *fonts-install
132
- - run : *pip-install
133
-
134
- - run :
135
- << : *deps-install
136
- environment :
137
- NUMPY_VERSION : " ==1.11.0"
138
- - run : *mpl-install
139
-
140
- - run : *doc-build
141
-
142
- # We don't build the LaTeX docs here, so linkchecker will complain
143
- - run : touch doc/build/html/Matplotlib.pdf
144
-
145
- - run : *doc-bundle
146
- - store_artifacts :
147
- path : doc/build/sphinx-gallery-files.tar.gz
148
-
149
- - store_artifacts :
150
- path : doc/build/html
151
-
152
- - run :
153
- name : " Built documentation is available at:"
154
- command : echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
155
-
156
-
157
124
# ########################################
158
125
# Defining workflows gets us parallelism.
159
126
#
@@ -162,5 +129,4 @@ workflows:
162
129
version : 2
163
130
build :
164
131
jobs :
165
- - docs-python35
166
132
- docs-python36
Original file line number Diff line number Diff line change @@ -75,13 +75,9 @@ matrix:
75
75
- RUN_PYTEST=
76
76
- RUN_FLAKE8=1
77
77
- 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'
83
78
- python : 3.6
84
79
env :
80
+ - PINNEDVERS='-c requirements/testing/travis36minver.txt'
85
81
- DELETE_FONT_CACHE=1
86
82
- EXTRAREQS='-r requirements/testing/travis36.txt'
87
83
- python : 3.7
Original file line number Diff line number Diff line change @@ -133,7 +133,7 @@ Dependencies
133
133
134
134
Matplotlib requires the following dependencies:
135
135
136
- * `Python <https://www.python.org/downloads/ >`_ (>= 3.5 )
136
+ * `Python <https://www.python.org/downloads/ >`_ (>= 3.6 )
137
137
* `FreeType <https://www.freetype.org/ >`_ (>= 2.3)
138
138
* `libpng <http://www.libpng.org >`_ (>= 1.2)
139
139
* `NumPy <http://www.numpy.org >`_ (>= 1.11)
Original file line number Diff line number Diff line change 10
10
vmImage : ' Ubuntu 16.04'
11
11
strategy :
12
12
matrix :
13
- Python35 :
14
- python.version : ' 3.5'
15
13
Python36 :
16
14
python.version : ' 3.6'
17
15
Python37 :
You can’t perform that action at this time.
0 commit comments