debian/control

@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 11),
                python3-grib,
                python3-h5netcdf,
                python3-h5py,
+               python3-hdf4,
                python3-imageio,
                python3-libtiff (>= 0.4.2),
                python3-netcdf4,
@@ -49,7 +50,8 @@ Depends: ${misc:Depends},
          ${python3:Depends},
          ${sphinxdoc:Depends},
          python3-dask,
-         ptyhon3-grib,
+         python3-grib,
+         python3-hdf4,
          python3-numpy,
          python3-pil,
          python3-pykdtree,

debian/patches/0001-Disable-pyhdf.patch

-From: Antonio Valentino <antonio.valentino@tiscali.it>
-Date: Sat, 22 Dec 2018 16:21:14 +0000
-Subject: Disable pyhdf
-
----
- satpy/tests/reader_tests/__init__.py | 14 ++++++++------
- setup.py                             |  3 ++-
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/satpy/tests/reader_tests/__init__.py b/satpy/tests/reader_tests/__init__.py
-index 5a031bd..d6cb4b0 100644
---- a/satpy/tests/reader_tests/__init__.py
-+++ b/satpy/tests/reader_tests/__init__.py
-@@ -28,15 +28,17 @@ from satpy.tests.reader_tests import (test_abi_l1b, test_hrit_base,
-                                       test_viirs_sdr, test_viirs_l1b,
-                                       test_native_msg, test_msg_base,
-                                       test_hdf5_utils, test_netcdf_utils,
--                                      test_hdf4_utils, test_utils,
-+                                      # test_hdf4_utils,
-+                                      test_utils,
-                                       test_acspo, test_amsr2_l1b,
-                                       test_omps_edr, test_nucaps, test_geocat,
--                                      test_seviri_calibration, test_clavrx,
-+                                      test_seviri_calibration, # test_clavrx,
-                                       test_grib, test_hrit_goes, test_ahi_hsd,
-                                       test_iasi_l2, test_generic_image,
-                                       test_scmi, test_hrit_jma, test_nc_goes,
-                                       test_nc_slstr, test_nc_olci,
--                                      test_viirs_flood, test_nc_nwcsaf,
-+                                      # test_viirs_flood,
-+                                      test_nc_nwcsaf,
-                                       test_hrit_msg)
- 
- 
-@@ -55,7 +57,7 @@ def suite():
-     mysuite.addTests(test_hrit_base.suite())
-     mysuite.addTests(test_native_msg.suite())
-     mysuite.addTests(test_msg_base.suite())
--    mysuite.addTests(test_hdf4_utils.suite())
-+    # mysuite.addTests(test_hdf4_utils.suite())
-     mysuite.addTests(test_hdf5_utils.suite())
-     mysuite.addTests(test_netcdf_utils.suite())
-     mysuite.addTests(test_utils.suite())
-@@ -66,14 +68,14 @@ def suite():
-     mysuite.addTests(test_geocat.suite())
-     mysuite.addTests(test_nc_olci.suite())
-     mysuite.addTests(test_seviri_calibration.suite())
--    mysuite.addTests(test_clavrx.suite())
-+    # mysuite.addTests(test_clavrx.suite())
-     mysuite.addTests(test_grib.suite())
-     mysuite.addTests(test_hrit_goes.suite())
-     mysuite.addTests(test_ahi_hsd.suite())
-     mysuite.addTests(test_iasi_l2.suite())
-     mysuite.addTests(test_generic_image.suite())
-     mysuite.addTests(test_scmi.suite())
--    mysuite.addTests(test_viirs_flood.suite())
-+    # mysuite.addTests(test_viirs_flood.suite())
-     mysuite.addTests(test_hrit_jma.suite())
-     mysuite.addTests(test_nc_goes.suite())
-     mysuite.addTests(test_nc_slstr.suite())
-diff --git a/setup.py b/setup.py
-index 83542db..06c5ff2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,7 +36,8 @@ requires = ['numpy >=1.12', 'pillow', 'pyresample >=1.10.3', 'trollsift',
-             'dask[array] >=0.17.1']
- 
- # pyhdf (conda) == python-hdf4 (pip)
--test_requires = ['behave', 'h5py', 'netCDF4', 'pyhdf', 'imageio', 'libtiff',
-+test_requires = ['behave', 'h5py', 'netCDF4', 'imageio', 'libtiff',
-+                 #'pyhdf',
-                  'rasterio']
- 
- if sys.version < '3.0':

debian/patches/0001-Fix-pyhdf.patch

+From: Antonio Valentino <antonio.valentino@tiscali.it>
+Date: Sat, 22 Dec 2018 16:21:14 +0000
+Subject: Fix pyhdf
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 83542db..86d710e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,7 +36,7 @@ requires = ['numpy >=1.12', 'pillow', 'pyresample >=1.10.3', 'trollsift',
+             'dask[array] >=0.17.1']
+ 
+ # pyhdf (conda) == python-hdf4 (pip)
+-test_requires = ['behave', 'h5py', 'netCDF4', 'pyhdf', 'imageio', 'libtiff',
++test_requires = ['behave', 'h5py', 'netCDF4', 'python-hdf4', 'imageio', 'libtiff',
+                  'rasterio']
+ 
+ if sys.version < '3.0':

debian/patches/series

-0001-Disable-pyhdf.patch
+0001-Fix-pyhdf.patch
 0002-Compatibility-with-Python-3.7.patch

debian/tests/python3

@@ -2,9 +2,8 @@
 set -efu
 
 PYS=${PYS:-"$(py3versions -r 2>/dev/null)"}
-TESTPKG=${TESTPKG:-pyresample}
 
-cd "$ADTTMP"
+cd "$AUTOPKGTEST_TMP"
 
 for py in $PYS; do
     echo "=== $py ==="