Skip to content
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

Jump to bottom

DM-22256: Remove skipUnless pyarrow available #375

Merged
merged 1 commit into from
Apr 16, 2020
Merged

DM-22256: Remove skipUnless pyarrow available #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 8 additions & 15 deletions tests/test_functors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,18 @@
import lsst.geom as geom
import lsst.meas.base as measBase
import lsst.utils.tests

# TODO: Remove skipUnless and this try block DM-22256
try:
from lsst.pipe.tasks.parquetTable import MultilevelParquetTable
from lsst.pipe.tasks.functors import (CompositeFunctor, CustomFunctor, Column, RAColumn,
DecColumn, Mag, MagDiff, Color, StarGalaxyLabeller,
DeconvolvedMoments, SdssTraceSize, PsfSdssTraceSizeDiff,
HsmTraceSize, PsfHsmTraceSizeDiff, HsmFwhm,
LocalPhotometry, LocalNanojansky, LocalNanojanskyErr,
LocalMagnitude, LocalMagnitudeErr,
LocalWcs, ComputePixelScale, ConvertPixelToArcseconds)
havePyArrow = True
except ImportError:
havePyArrow = False
from lsst.pipe.tasks.parquetTable import MultilevelParquetTable
from lsst.pipe.tasks.functors import (CompositeFunctor, CustomFunctor, Column, RAColumn,
DecColumn, Mag, MagDiff, Color, StarGalaxyLabeller,
DeconvolvedMoments, SdssTraceSize, PsfSdssTraceSizeDiff,
HsmTraceSize, PsfHsmTraceSizeDiff, HsmFwhm,
LocalPhotometry, LocalNanojansky, LocalNanojanskyErr,
LocalMagnitude, LocalMagnitudeErr,
LocalWcs, ComputePixelScale, ConvertPixelToArcseconds)

ROOT = os.path.abspath(os.path.dirname(__file__))


@unittest.skipUnless(havePyArrow, "Requires pyarrow")
class FunctorTestCase(unittest.TestCase):

def simulateMultiParquet(self, dataDict):
Expand Down
13 changes: 3 additions & 10 deletions tests/test_parquet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,15 @@

import lsst.utils.tests

# TODO: Remove skipUnless and this try block DM-22256
try:
import pyarrow as pa
import pyarrow.parquet as pq
from lsst.pipe.tasks.parquetTable import ParquetTable, MultilevelParquetTable
havePyArrow = True
except ImportError:
havePyArrow = False
import pyarrow as pa
import pyarrow.parquet as pq
from lsst.pipe.tasks.parquetTable import ParquetTable, MultilevelParquetTable


def setup_module(module):
lsst.utils.tests.init()


@unittest.skipUnless(havePyArrow, "Requires pyarrow")
class ParquetTableTestCase(unittest.TestCase):
"""Test case for ParquetTable
"""
Expand Down Expand Up @@ -92,7 +86,6 @@ def testColumns(self):
self.assertTrue(self.parq.toDataFrame(columns=columns + ['hello']).equals(self.df[columns]))


@unittest.skipUnless(havePyArrow, "Requires pyarrow")
class MultilevelParquetTableTestCase(ParquetTableTestCase):
"""Test case for MultilevelParquetTable
"""
Expand Down
16 changes: 5 additions & 11 deletions tests/test_transformObject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,11 @@

import lsst.utils.tests

# TODO: Remove skipUnless and this try block DM-22256
try:
import pyarrow as pa
import pyarrow.parquet as pq
from lsst.pipe.tasks.parquetTable import MultilevelParquetTable
from lsst.pipe.tasks.functors import HsmFwhm
from lsst.pipe.tasks.postprocess import TransformObjectCatalogTask, TransformObjectCatalogConfig
havePyArrow = True
except ImportError:
havePyArrow = False
import pyarrow as pa
import pyarrow.parquet as pq
from lsst.pipe.tasks.parquetTable import MultilevelParquetTable
from lsst.pipe.tasks.functors import HsmFwhm
from lsst.pipe.tasks.postprocess import TransformObjectCatalogTask, TransformObjectCatalogConfig

ROOT = os.path.abspath(os.path.dirname(__file__))

Expand All @@ -43,7 +38,6 @@ def setup_module(module):
lsst.utils.tests.init()


@unittest.skipUnless(havePyArrow, "Requires pyarrow")
class TransformObjectCatalogTestCase(unittest.TestCase):
def setUp(self):
# Note that this test input includes HSC-G, HSC-R, and HSC-I data
Expand Down