lsst · r-owen · Jun 8, 2018 · Jun 5, 2018 · Jun 5, 2018 · Jun 5, 2018
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@ _build.*
 config.log
 .sconf_temp
 .cache
+.pytest_cache
+pytest_session.txt
+.coverage
 *.o
 *.os
 *.so

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+sudo: false
+language: python
+matrix:
+  include:
+    - python: '3.6'
+      install:
+      - pip install flake8
+      script: flake8
diff --git a/examples/shapeletBases.py b/examples/shapeletBases.py
@@ -88,5 +88,6 @@ def main():
     processBasis(laguerreBasis, x, y)
     pyplot.show()
 
+
 if __name__ == "__main__":
     main()
diff --git a/examples/shapeletConvolve.py b/examples/shapeletConvolve.py
@@ -56,6 +56,7 @@ def main():
     plotShapeletFunction(pyplot.subplot(1, 3, 3), fC, x, y)
     pyplot.show()
 
+
 if __name__ == "__main__":
     numpy.set_printoptions(suppress=True)
     main()
diff --git a/examples/timeModels.cc b/examples/timeModels.cc
@@ -21,7 +21,6 @@
  */
 #include <pybind11/pybind11.h>
 //#include <pybind11/stl.h>
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet.h"
@@ -82,11 +81,6 @@ void buildModelsD(
 PYBIND11_PLUGIN(_timeModels) {
     py::module mod("_timeModels", "");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     mod.def("buildModelsF", buildModelsF);
     mod.def("buildModelsD", buildModelsD);
 

diff --git a/examples/timeModels.py b/examples/timeModels.py
@@ -64,5 +64,6 @@ def main():
         (res2.ru_stime - res1.ru_stime) / factor
     ))
 
+
 if __name__ == "__main__":
     main()
diff --git a/python/lsst/shapelet/basisEvaluator.cc b/python/lsst/shapelet/basisEvaluator.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/BasisEvaluator.h"
@@ -37,11 +36,6 @@ PYBIND11_PLUGIN(basisEvaluator) {
 
     py::module mod("basisEvaluator");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<BasisEvaluator, std::shared_ptr<BasisEvaluator>> clsBasisEvaluator(mod, "BasisEvaluator");
 
     /* Constructors */

diff --git a/python/lsst/shapelet/gaussHermiteConvolution.cc b/python/lsst/shapelet/gaussHermiteConvolution.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/GaussHermiteConvolution.h"
@@ -36,11 +35,6 @@ namespace shapelet {
 PYBIND11_PLUGIN(gaussHermiteConvolution) {
     py::module mod("gaussHermiteConvolution");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<GaussHermiteConvolution, std::shared_ptr<GaussHermiteConvolution>> clsGaussHermiteConvolution(
             mod, "GaussHermiteConvolution");
 

diff --git a/python/lsst/shapelet/gaussHermiteProjection.cc b/python/lsst/shapelet/gaussHermiteProjection.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/GaussHermiteProjection.h"
@@ -36,11 +35,6 @@ PYBIND11_PLUGIN(gaussHermiteProjection) {
     py::module::import("lsst.afw.geom");
     py::module mod("gaussHermiteProjection");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<GaussHermiteProjection, std::shared_ptr<GaussHermiteProjection>> clsGaussHermiteProjection(
             mod, "GaussHermiteProjection");
 

diff --git a/python/lsst/shapelet/hermiteTransformMatrix.cc b/python/lsst/shapelet/hermiteTransformMatrix.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/HermiteTransformMatrix.h"
@@ -37,11 +36,6 @@ PYBIND11_PLUGIN(hermiteTransformMatrix) {
 
     py::module mod("hermiteTransformMatrix");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<HermiteTransformMatrix, std::shared_ptr<HermiteTransformMatrix>> clsHermiteTransformMatrix(
             mod, "HermiteTransformMatrix");
 

diff --git a/python/lsst/shapelet/matrixBuilder.cc b/python/lsst/shapelet/matrixBuilder.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/MatrixBuilder.h"
@@ -131,11 +130,6 @@ PYBIND11_PLUGIN(matrixBuilder) {
     py::module::import("lsst.afw.geom");
     py::module mod("matrixBuilder");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     declareMatrixBuilderTemplates<float>(mod, "F");
     declareMatrixBuilderTemplates<double>(mod, "D");
 

diff --git a/python/lsst/shapelet/multiShapeletBasis.cc b/python/lsst/shapelet/multiShapeletBasis.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/MultiShapeletBasis.h"
@@ -35,11 +34,6 @@ namespace shapelet {
 PYBIND11_PLUGIN(multiShapeletBasis) {
     py::module mod("multiShapeletBasis");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<MultiShapeletBasisComponent, std::shared_ptr<MultiShapeletBasisComponent>>
             clsMultiShapeletBasisComponent(mod, "MultiShapeletBasisComponent");
 

diff --git a/python/lsst/shapelet/multiShapeletFunction/multiShapeletFunction.cc b/python/lsst/shapelet/multiShapeletFunction/multiShapeletFunction.cc
@@ -22,7 +22,6 @@
 #include "pybind11/pybind11.h"
 #include "pybind11/stl.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/MultiShapeletFunction.h"
@@ -98,11 +97,6 @@ PYBIND11_PLUGIN(multiShapeletFunction) {
 
     py::module mod("multiShapeletFunction");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<MultiShapeletFunction, std::shared_ptr<MultiShapeletFunction>> clsMultiShapeletFunction(
             mod, "MultiShapeletFunction");
     py::class_<MultiShapeletFunctionEvaluator, std::shared_ptr<MultiShapeletFunctionEvaluator>>

diff --git a/python/lsst/shapelet/radialProfile/radialProfile.cc b/python/lsst/shapelet/radialProfile/radialProfile.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/RadialProfile.h"
@@ -35,11 +34,6 @@ namespace shapelet {
 PYBIND11_PLUGIN(radialProfile) {
     py::module mod("radialProfile");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<RadialProfile, std::shared_ptr<RadialProfile>> clsRadialProfile(mod, "RadialProfile");
 
     clsRadialProfile.def_static("get", &RadialProfile::get, py::return_value_policy::reference);

diff --git a/python/lsst/shapelet/shapeletFunction/shapeletFunction.cc b/python/lsst/shapelet/shapeletFunction/shapeletFunction.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/shapelet/ShapeletFunction.h"
@@ -38,11 +37,6 @@ PYBIND11_PLUGIN(shapeletFunction) {
 
     py::module mod("shapeletFunction");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     py::class_<ShapeletFunction, std::shared_ptr<ShapeletFunction>> clsShapeletFunction(mod,
                                                                                         "ShapeletFunction");
 

diff --git a/python/lsst/shapelet/tractor.py b/python/lsst/shapelet/tractor.py
@@ -82,6 +82,8 @@ def registerRadialProfiles():
             matrix = numpy.array([[amplitude / ShapeletFunction.FLUX_FACTOR]], dtype=float)
             basis.addComponent(radius, 0, matrix)
         profile.registerBasis(basis, nComponents, maxRadius)
+
+
 # We register all the profiles at module import time, to allow C++ code to access all available profiles
 # without having to later call Python code to unpickle them.
 registerRadialProfiles()

diff --git a/tests/SConscript b/tests/SConscript
@@ -1,3 +1,3 @@
 # -*- python -*-
 from lsst.sconsUtils import scripts
-scripts.BasicSConscript.tests()
+scripts.BasicSConscript.tests(pyList=[])
diff --git a/tests/data/generate.py b/tests/data/generate.py
@@ -91,5 +91,6 @@ def main():
     f3.draw(image, dx=1.0)
     image.write("gaussians.fits")
 
+
 if __name__ == "__main__":
     main()