Skip to content

Commit

Permalink
Cleanup pybind11
Browse files Browse the repository at this point in the history
  • Loading branch information
Pim Schellart authored and Pim Schellart committed Mar 25, 2017
1 parent c4773c5 commit a2fa5be
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion examples/runAssembleTask.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import print_function
from __future__ import absolute_import, division, print_function
from lsst.ip.isr import AssembleCcdTask
import lsst.afw.display.ds9 as ds9
import exampleUtils
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ip/isr/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# see <https://www.lsstcorp.org/LegalNotices/>.
#

from __future__ import absolute_import
from __future__ import absolute_import, division, print_function

from .applyLookupTable import *
from .isr import *
Expand Down
8 changes: 5 additions & 3 deletions python/lsst/ip/isr/applyLookupTable.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/
#include "pybind11/pybind11.h"
#include "pybind11/stl.h"

#include "numpy/arrayobject.h"
#include "ndarray/pybind11.h"

Expand Down Expand Up @@ -56,6 +57,7 @@ PYBIND11_PLUGIN(applyLookupTable) {

return mod.ptr();
}
}
}
} // lsst::ip::isr

} // isr
} // ip
} // lsst
2 changes: 1 addition & 1 deletion python/lsst/ip/isr/assembleCcdTask.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.
#
from __future__ import division, print_function, absolute_import
from __future__ import absolute_import, division, print_function
import lsst.afw.cameraGeom as cameraGeom
import lsst.afw.cameraGeom.utils as cameraGeomUtils
import lsst.afw.image as afwImage
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ip/isr/fringe.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# see <http://www.lsstcorp.org/LegalNotices/>.
#

from __future__ import division, print_function, absolute_import
from __future__ import absolute_import, division, print_function
from builtins import zip
from builtins import input
from builtins import range
Expand Down
11 changes: 6 additions & 5 deletions python/lsst/ip/isr/isr.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
* the GNU General Public License along with this program. If not,
* see <https://www.lsstcorp.org/LegalNotices/>.
*/
#include <memory>

#include "pybind11/pybind11.h"

#include <memory>

#include "lsst/ip/isr/isr.h"

namespace py = pybind11;
Expand Down Expand Up @@ -73,6 +73,7 @@ PYBIND11_PLUGIN(isr) {

return mod.ptr();
}
}
}
} // lsst::ip::isr

} // isr
} // ip
} // lsst
2 changes: 1 addition & 1 deletion python/lsst/ip/isr/isrFunctions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import division, print_function, absolute_import
from __future__ import absolute_import, division, print_function
from builtins import input
from builtins import range
#
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ip/isr/isrTask.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import division, print_function, absolute_import
from __future__ import absolute_import, division, print_function
from builtins import range
from builtins import object
#
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ip/isr/linearize.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import division, print_function, absolute_import
from __future__ import absolute_import, division, print_function
from builtins import object
#
# LSST Data Management System
Expand Down
2 changes: 1 addition & 1 deletion tests/testFringes.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.
#
from __future__ import print_function
from __future__ import absolute_import, division, print_function
from builtins import zip
from builtins import object
import unittest
Expand Down

0 comments on commit a2fa5be

Please sign in to comment.