Merge branch 'staging'

Author: pacesm

eoxmagmod/MANIFEST.in

@@ -1,6 +1,6 @@
 include MANIFEST.in
 recursive-exclude eoxmagmod *.pyc *.o
 recursive-include eoxmagmod *.c *.h
-graft eoxmagmod/data
-graft eoxmagmod/tests/data
-graft eoxmagmod/magnetic_model/tests/data
+recursive-include eoxmagmod/data *.txt *.shc *.cof *.COF
+recursive-include eoxmagmod/tests/data *.txt *.tsv
+recursive-include eoxmagmod/magnetic_models/tests/data *.txt *.cdf

eoxmagmod/eoxmagmod/pymm_aux.h

@@ -129,8 +129,6 @@ static PyArrayObject* _get_as_double_array(PyObject *data, int dmin, int dmax,
                 int reqs, const char *label)
 {
     return _get_as_array(data, NPY_FLOAT64, dmin, dmax, reqs, label);
-    PyArray_Descr *dtype = PyArray_DescrFromType(NPY_FLOAT64);
-    return (PyArrayObject*) PyArray_FromAny(data, dtype, dmin, dmax, reqs, NULL);
 }