Skip to content

Commit 9f83d53

Browse files
committed
Merge pull request #6340 from tacaswell/bld_update_cycler_dep
BLD: make minimum cycler version 0.10.0
1 parent b6e0b9b commit 9f83d53

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

INSTALL

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,13 @@ Required Dependencies
212212
Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz
213213

214214
:term:`FreeType` 2.3 or later
215-
library for reading true type font files.
215+
Library for reading true type font files. If using pip, easy_install or
216+
installing from source, the installer will attempt to locate FreeType in
217+
expected locations. If it cannot, try installing `pkg-config
218+
<http://matplotlib.org/users/installing.html#optional-dependencies>`__,
219+
a tool used to find required non-python libraries.
216220

217-
`cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
221+
`cycler <http://matplotlib.org/cycler/>`__ 0.10.0 or later
218222
Composable cycle class used for constructing style-cycles
219223

220224
`functools32`

setupext.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,11 +1319,10 @@ def check(self):
13191319
"cycler was not found. "
13201320
"pip will attempt to install it "
13211321
"after matplotlib.")
1322-
13231322
return "using cycler version %s" % cycler.__version__
13241323

13251324
def get_install_requires(self):
1326-
return ['cycler>=0.9']
1325+
return ['cycler>=0.10']
13271326

13281327

13291328
class Dateutil(SetupPackage):

0 commit comments

Comments
 (0)