Commit9f83d53

committed

Merge pull request#6340 from tacaswell/bld_update_cycler_dep

BLD: make minimum cycler version 0.10.0

1 parentb6e0b9b commit9f83d53Copy full SHA for 9f83d53

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,13 @@ Required Dependencies`
`212`	`212`	`Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz`
`213`	`213`
`214`	`214`	: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.`
`216`	`220`
`217`		-`cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
	`221`	+`cycler <http://matplotlib.org/cycler/>`__ 0.10.0 or later
`218`	`222`	`Composable cycle class used for constructing style-cycles`
`219`	`223`
`220`	`224`	`functools32`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1319,11 +1319,10 @@ def check(self):`
`1319`	`1319`	`"cycler was not found. "`
`1320`	`1320`	`"pip will attempt to install it "`
`1321`	`1321`	`"after matplotlib.")`
`1322`		`-`
`1323`	`1322`	`return"using cycler version %s"%cycler.__version__`
`1324`	`1323`
`1325`	`1324`	`defget_install_requires(self):`
`1326`		`-return ['cycler>=0.9']`
	`1325`	`+return ['cycler>=0.10']`
`1327`	`1326`
`1328`	`1327`
`1329`	`1328`	`classDateutil(SetupPackage):`

Comments

(0)