Skip to content

Don't use deprecated numpy APIs #3547

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 14 commits into from
Oct 17, 2014
Merged

Don't use deprecated numpy APIs #3547

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fdb9b31
Replace old numpy macros with their new versions
jkseppan Sep 20, 2014
1e25fe1
Fix deprecated api usage in _png.cpp
jkseppan Sep 20, 2014
3658571
Fix deprecated api usage in _image.cpp
jkseppan Sep 20, 2014
9c4f149
Fix deprecated api usage in agg_py_path_iterator.h
jkseppan Sep 21, 2014
9df9d31
Fix deprecated api usage in _path.cpp
jkseppan Sep 21, 2014
4683de5
Fix deprecated api usage in cntr.c
jkseppan Sep 21, 2014
0ae32cb
Fix deprecated api usage in _delaunay.cpp
jkseppan Sep 21, 2014
6f10f71
Fix deprecated api usage in _backend_agg.cpp
jkseppan Sep 21, 2014
447c90d
Numpy 1.6 compatibility in _delaunay.cpp
jkseppan Sep 21, 2014
0c074fc
Test with numpy 1.6 on Travis
jkseppan Sep 21, 2014
514899e
Fix C++ism in C file
jkseppan Sep 21, 2014
e3d70c0
Turn numpy deprecation warnings into errors
jkseppan Sep 21, 2014
5f0158e
Fix deprecated api usage in _macosx.m
jkseppan Sep 22, 2014
b279c15
Remove extra Py_XDECREF calls
jkseppan Sep 24, 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
Prev Previous commit
Next Next commit
Numpy 1.6 compatibility in _delaunay.cpp
  • Loading branch information
@jkseppan
jkseppan committed Sep 21, 2014
commit 447c90d65a43261686fab9decb38edb3eaae4014
5 changes: 5 additions & 0 deletions lib/matplotlib/delaunay/_delaunay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
#include "natneighbors.h"
#include "numpy/noprefix.h"

// support numpy 1.6 - this macro got renamed and deprecated at once in 1.7
#ifndef NPY_ARRAY_IN_ARRAY
#define NPY_ARRAY_IN_ARRAY NPY_IN_ARRAY
#endif

using namespace std;

extern "C" {
Expand Down