Merge pull request #21 from lsst/tickets/DM-14625

DM-14625: Fix ndarray compiler warnings
lsst · Jun 8, 2018 · 80686ba · 80686ba
2 parents 615e0bb + a302d31
commit 80686ba
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@ _build.*
 .sconsign.dblite
 config.log
 .sconf_temp
+.cache
+.pytest_cache
+pytest_session.txt
 *.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/python/lsst/meas/extensions/simpleShape/simpleShape.cc b/python/lsst/meas/extensions/simpleShape/simpleShape.cc
@@ -21,7 +21,6 @@
  */
 #include "pybind11/pybind11.h"
 
-#include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/meas/extensions/simpleShape.h"
@@ -55,11 +54,6 @@ PYBIND11_PLUGIN(simpleShape) {
 
     py::module mod("simpleShape");
 
-    if (_import_array() < 0) {
-        PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-        return nullptr;
-    }
-
     /* Module level */
     py::class_<SimpleShape, std::shared_ptr<SimpleShape>, base::SimpleAlgorithm> clsSimpleShape(
             mod, "SimpleShape");

diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,8 @@
+[flake8]
+max-line-length = 110
+ignore = E133, E226, E228, N802, N803, N806
+exclude = __init__.py
+
+[tool:pytest]
+addopts = --flake8
+flake8-ignore = E133 E226 E228 N802 N803 N806
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=[])