8000 Build dep updates by tacaswell · Pull Request #3479 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Build dep updates #3479

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 3 commits into from
Sep 27, 2014
Merged

Build dep updates #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c04e9
BLD/BUG/DOC : made pytz a required dependency
tacaswell Sep 6, 2014
f40bf14
DOC : removed freetype version caveats
tacaswell Sep 6, 2014
ac62606
BLD : updated message when to pytz found
tacaswell Sep 6, 2014
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
19 changes: 7 additions & 12 deletions INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,11 @@ libpng 1.2 (or later)
<http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
zlib.

`pytz`
Used to manipulate time-zone aware datetimes.



Optional GUI framework
^^^^^^^^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -240,18 +245,8 @@ Optional dependencies
selection of image file formats.


:term:`freetype` 2.4 or later
library for reading true type font files. Matplotlib in known
to work with freetype 2.3, and the required version will be reduced
in 1.4.1. If you need to build from source on a system which only has
freetype 2.3 available, please edit L945 of `setupext.py` to reduce
`min_version` to 2.3.

`pytz`
Required if you want to manipulate datetime objects which are time-zone
aware. An exception will be raised if you try to make time-zone aware
plots with out `pytz` installed. It will become a required dependency
in 1.4.1.
:term:`freetype` 2.3 or later
library for reading true type font files.


Required libraries that ship with matplotlib
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
setupext.Numpy(),
setupext.Six(),
setupext.Dateutil(),
setupext.Pytz(),
setupext.Tornado(),
setupext.Pyparsing(),
setupext.CXX(),
Expand Down
8000
19 changes: 19 additions & 0 deletions setupext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,7 @@ def get_extension(self):
self.add_flags(ext)
return ext


class FT2Font(SetupPackage):
name = 'ft2font'

Expand Down Expand Up @@ -1183,6 +1184,24 @@ def get_install_requires(self):
return ['six>={0}'.format(self.min_version)]


class Pytz(SetupPackage):
name = "pytz"

def check(self):
try:
import pytz
except ImportError:
return (
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be raise CheckFailed("...") otherwise you are going to get a positive (yes) return

Copy link
Member Author

Choose a reason for hiding this comment

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

I think this is fine because it will get added to the setup requirements list and pip-installed if it is not found.

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it. You may want to add pip may attempt to install it afterwards text in the return message like what is done in Dateutil

"pytz was not found. "
"pip will attempt to install it "
"after matplotlib.")

return "using pytz version %s" % pytz.__version__

def get_install_requires(self):
return ['pytz']


class Dateutil(SetupPackage):
name = "dateutil"

Expand Down
0