8000 ENH: Disable check for framework Python in OSX backend. by dopplershift · Pull Request #92 · conda-forge/matplotlib-feedstock · GitHub
[go: up one dir, main page]
Skip to content

ENH: Disable check for framework Python in OSX backend. #92

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 1 commit into from
Dec 30, 2016
Merged

ENH: Disable check for framework Python in OSX backend. #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ source:
- cfg_qt4agg.patch # [linux]
# Patches the matplotlibrc template to default to Qt4.
- rctmp_pyside.patch # [not osx]
# Removes framework check from osx backend (seems unneeded)
- osx-frame.patch # [osx]

build:
number: 4
number: 5

requirements:
build:
Expand Down Expand Up @@ -60,7 +62,7 @@ requirements:
test:
imports:
- matplotlib
- matplotlib.pyplot # [not osx]
- matplotlib.pyplot
- matplotlib._cntr
- matplotlib._delaunay
- matplotlib._image
Expand All @@ -72,10 +74,7 @@ test:
- matplotlib.ttconv
- matplotlib.backends._tkagg # [not win]
- mpl_toolkits
- pylab # [not osx]
commands:
- pythonw -c "import matplotlib.pyplot" # [osx]
- pythonw -c "import pylab" # [osx]
- pylab

about:
home: http://matplotlib.org/
Expand Down
18 changes: 18 additions & 0 deletions recipe/osx-frame.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git src/_macosx.m src/_macosx.m
index 58b78ac..45c2d71 100644
--- src/_macosx.m
+++ src/_macosx.m
@@ -6348,13 +6348,6 @@ void init_macosx(void)

NSApp = [NSApplication sharedApplication];

- if (!verify_framework())
-#if PY3K
- return NULL;
-#else
- return;
-#endif
-
#if PY3K
module = PyModule_Create(&moduledef);
if (module==NULL) return NULL;
0