Include simple tests in package

Author: znicholls

CHANGELOG.rst

@@ -4,6 +4,30 @@ Changelog
 master
 ------
 
+- Include simple tests in package
+
+
+0.2.3
+-----
+
+- Include LICENSE in package
+
+
+0.2.2
+-----
+
+- Add conda dev environment details
+
+
+0.2.1
+-----
+
+- Update setup.py to reflect actual supported python versions
+
+
+0.2.0
+-----
+
 - (`#4 <https://github.com/znicholls/netcdf-scm/pull/4>`_) Add work done elsewhere previously
     - ``SCMCube`` base class for handling netCDF files
         - reading, cutting and manipulating files for SCM use

MANIFEST.in

@@ -2,5 +2,7 @@ include README.rst
 include LICENSE
 include CHANGELOG.rst
 
+recursive-include tests *.py
+
 include versioneer.py
 include src/netcdf_scm/_version.py

setup.py

@@ -61,7 +61,7 @@ def run_tests(self):
         "simple climate model",
         "reduced complexity climate model",
     ],
-    packages=find_packages(SOURCE_DIR),
+    packages=find_packages(SOURCE_DIR),  # no tests/docs in `src` so don't need exclude
     package_dir={"": SOURCE_DIR},
     # package_data={
     #     "": ["*.csv"],

tests/conftest.py

@@ -1,4 +1,4 @@
-from os.path import join, dirname, abspath
+from os.path import join, dirname, abspath, isdir
 import warnings
 
 
@@ -35,6 +35,9 @@
 )
 
 
+tdata_required = pytest.mark.skipif(not isdir(TEST_DATA_ROOT_DIR), reason="test data required")
+
+
 def get_test_cube_lon():
     lon = iris.coords.DimCoord(
         np.array([45, 135, 225, 315]),

tests/integration/test_integrated_behaviour_scmcube.py

@@ -12,12 +12,13 @@
 
 
 from netcdf_scm.iris_cube_wrappers import SCMCube, MarbleCMIP5Cube
-from conftest import TEST_TAS_FILE, TEST_AREACELLA_FILE
+from conftest import TEST_TAS_FILE, TEST_AREACELLA_FILE, tdata_required
 
 
 class TestSCMCubeIntegration(object):
     tclass = SCMCube
 
+    @tdata_required
     def test_load_data_and_areacella(self, test_cube):
         tfile = TEST_TAS_FILE
         test_cube.get_file_from_load_data_args = MagicMock(return_value=tfile)

tests/unit/test_scmcube.py

@@ -15,7 +15,7 @@
 
 
 from netcdf_scm.iris_cube_wrappers import SCMCube, MarbleCMIP5Cube
-from conftest import TEST_DATA_MARBLE_CMIP5_DIR, TEST_TAS_FILE, TEST_AREACELLA_FILE
+from conftest import TEST_DATA_MARBLE_CMIP5_DIR, TEST_TAS_FILE, TEST_AREACELLA_FILE, tdata_required
 
 
 class TestSCMCube(object):
@@ -96,6 +96,7 @@ def test_process_load_data_warnings(self, test_cube):
             mock_warn_area_result[3].message
         )
 
+    @tdata_required
     def test_add_areacella_measure(self, test_cube):
         # can safely ignore warnings here
         with warnings.catch_warnings():
@@ -114,6 +115,7 @@ def test_add_areacella_measure(self, test_cube):
             ["cell_area" in cm.standard_name for cm in test_cube.cube.cell_measures()]
         )
 
+    @tdata_required
     def test_load_missing_variable_error(self, test_cube):
         tfile = TEST_TAS_FILE
         test_cube.get_file_from_load_data_args = MagicMock(return_value=tfile)

tests/unit/test_utils.py

@@ -18,8 +18,10 @@
     take_lat_lon_mean,
     apply_mask,
 )
+from conftest import tdata_required
 
 
+@tdata_required
 def test_assert_only_cube_dim_coord_is_time(test_generic_tas_cube):
     original_cube = test_generic_tas_cube.cube
 
@@ -52,6 +54,7 @@ def test_assert_only_cube_dim_coord_is_time(test_generic_tas_cube):
     _assert_only_cube_dim_coord_is_time(test_generic_tas_cube)
 
 
+@tdata_required
 @patch("netcdf_scm.utils._assert_only_cube_dim_coord_is_time")
 def test_get_cube_timeseries_data(mock_assert_only_time, test_generic_tas_cube):
     expected = test_generic_tas_cube.cube.data
@@ -61,6 +64,7 @@ def test_get_cube_timeseries_data(mock_assert_only_time, test_generic_tas_cube):
     mock_assert_only_time.assert_called_with(test_generic_tas_cube)
 
 
+@tdata_required
 @pytest.mark.parametrize("out_calendar", ["gregorian", "julian", "365_day"])
 def test_get_cube_time_axis_in_calendar(test_generic_tas_cube, out_calendar):
     tcn = test_generic_tas_cube.cube.coord_dims("time")[0]
@@ -71,6 +75,7 @@ def test_get_cube_time_axis_in_calendar(test_generic_tas_cube, out_calendar):
     np.testing.assert_array_equal(result, expected)
 
 
+@tdata_required
 def test_assert_all_time_axes_same(test_generic_tas_cube):
     tcn = test_generic_tas_cube.cube.coord_dims("time")[0]
     ttime = test_generic_tas_cube.cube.dim_coords[tcn]
@@ -85,6 +90,7 @@ def test_assert_all_time_axes_same(test_generic_tas_cube):
         assert_all_time_axes_same([otime_axis, ttime_axis])
 
 
+@tdata_required
 def test_take_lat_lon_mean(test_generic_tas_cube):
     with warnings.catch_warnings():
         warnings.filterwarnings("ignore", ".*Using DEFAULT_SPHERICAL.*")
@@ -99,6 +105,7 @@ def test_take_lat_lon_mean(test_generic_tas_cube):
     assert result.cube.cell_methods[0].coord_names == ("time",)
 
 
+@tdata_required
 def test_apply_mask(test_generic_tas_cube):
     tmask = np.full(test_generic_tas_cube.cube.shape, True)