[Git][debian-gis-team/satpy][master] 7 commits: Remove unneeded versioned dependencies
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sat Nov 6 18:07:06 GMT 2021
Antonio Valentino pushed to branch master at Debian GIS Project / satpy
Commits:
0f57e250 by Antonio Valentino at 2021-11-06T16:08:44+00:00
Remove unneeded versioned dependencies
- - - - -
c6ce6300 by Antonio Valentino at 2021-11-06T16:11:04+00:00
Update dependencies
- - - - -
c5ed044a by Antonio Valentino at 2021-11-06T19:03:49+01:00
Refresh all patches
- - - - -
e3717f2a by Antonio Valentino at 2021-11-06T19:05:08+01:00
Add build dependency on python3-distributed
- - - - -
e1decaa5 by Antonio Valentino at 2021-11-06T19:05:20+01:00
Temporary disable tests on sar_c_safe
- - - - -
d00eb7d0 by Antonio Valentino at 2021-11-06T19:05:20+01:00
Update d/copyright file
- - - - -
e9cc42ad by Antonio Valentino at 2021-11-06T19:06:20+01:00
Fix d/control formatting
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/0001-Disable-extra-dependency-form-geoviews.patch
- debian/patches/0002-No-setuptools-scm.patch
- debian/patches/0003-Skip-broken-tests.patch
- debian/rules
- debian/tests/python3
Changes:
=====================================
debian/changelog
=====================================
@@ -2,12 +2,20 @@ satpy (0.26.0-1) UNRELEASED; urgency=medium
[ Bas Couwenberg ]
* Update watch file for GitHub URL changes.
+ * Bump Standards-Version to 4.6.0, no changes.
[ Antonio Valentino ]
* New upstream release.
-
- [ Bas Couwenberg ]
- * Bump Standards-Version to 4.6.0, no changes.
+ * Update d/copyright file.
+ * debian/control:
+ - remove unneeded versioned dependencies
+ - add dependency on python3-donfig, python3-pooch,
+ python3-appdirs, python3-rasterio and python3-distibuted.
+ * debian/patches:
+ - refresh all patches.
+ * debian/rules:
+ - temporary disable tests on sar_c_safe (optional feature)
+ because rioxarray is currently not available in Debian.
-- Antonio Valentino <antonio.valentino at tiscali.it> Sun, 21 Mar 2021 12:20:06 +0000
=====================================
debian/control
=====================================
@@ -7,13 +7,15 @@ Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 12),
dh-python,
python3-all,
+ python3-appdirs,
python3-behave,
python3-bs4,
python3-cloudpickle,
python3-dask (>= 2.8),
+ python3-distributed,
+ python3-donfig,
python3-eccodes,
python3-fsspec,
- python3-gdal,
python3-geotiepoints,
python3-glymur,
python3-grib,
@@ -23,15 +25,16 @@ Build-Depends: debhelper-compat (= 12),
python3-imageio,
python3-libtiff,
python3-netcdf4,
- python3-numpy (>= 1:1.13),
+ python3-numpy,
python3-pil,
python3-pint,
+ python3-pooch,
python3-pygac (>= 1.3.0),
python3-pycoast,
python3-pydecorate,
python3-pykdtree,
python3-pyninjotiff,
- python3-pyorbital (>= 1.3.1),
+ python3-pyorbital,
python3-pyproj,
python3-pyresample (>= 1.12.0),
python3-pyspectral (>= 0.8.7),
@@ -42,6 +45,7 @@ Build-Depends: debhelper-compat (= 12),
python3-setuptools,
python3-sphinx,
python3-sphinx-rtd-theme,
+ python3-sphinxcontrib.apidoc,
python3-tables,
python3-trollimage (>> 1.10.1),
python3-trollsched,
@@ -56,12 +60,15 @@ Homepage: https://github.com/pytroll/satpy
Package: python3-satpy
Architecture: all
-Depends: python3-dask (>= 2.8),
+Depends: python3-appdirs,
+ python3-dask (>= 2.8),
+ python3-donfig,
python3-eccodes,
python3-grib,
python3-hdf4 (>= 0.10.1),
- python3-numpy (>= 1:1.13),
+ python3-numpy,
python3-pil,
+ python3-pooch,
python3-pykdtree,
python3-pyproj,
python3-pyresample (>= 1.12.0),
@@ -76,7 +83,7 @@ Depends: python3-dask (>= 2.8),
${misc:Depends}
Recommends: python3-behave,
python3-bs4,
- python3-gdal,
+ python3-distributed,
python3-geotiepoints,
python3-glymur,
python3-h5netcdf,
@@ -85,11 +92,11 @@ Recommends: python3-behave,
python3-libtiff,
python3-netcdf4,
python3-pint,
- python3-pydecorate,
python3-pycoast,
+ python3-pydecorate,
python3-pygac,
python3-pyninjotiff,
- python3-pyorbital (>= 1.3.1),
+ python3-pyorbital,
python3-pyspectral (>= 0.8.7),
python3-rasterio,
python3-requests,
=====================================
debian/copyright
=====================================
@@ -4,7 +4,7 @@ Upstream-Contact: The Pytroll Team <pytroll at googlegroups.com>
Source: https://github.com/pytroll/satpy
Files: *
-Copyright: 2009-2020 PyTroll developers
+Copyright: 2009-2021 PyTroll developers
2010-2018 PyTroll Community
2011-2019 Pytroll
2014-2018 Adam Dybbroe
@@ -25,7 +25,7 @@ Copyright: 2004-2005 Eumetsat
License: GPL-2+
Files: debian/*
-Copyright: 2018-2020 Antonio Valentino <antonio.valentino at tiscali.it>
+Copyright: 2018-2021 Antonio Valentino <antonio.valentino at tiscali.it>
License: GPL-3+
License: GPL-3+
=====================================
debian/patches/0001-Disable-extra-dependency-form-geoviews.patch
=====================================
@@ -9,11 +9,11 @@ Forwarded: not-needed
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/satpy/tests/test_scene.py b/satpy/tests/test_scene.py
-index 2ff5e90..562175a 100644
+index 9ae8b15..1cf33a4 100644
--- a/satpy/tests/test_scene.py
+++ b/satpy/tests/test_scene.py
-@@ -2285,6 +2285,13 @@ class TestSceneSaving(unittest.TestCase):
- os.path.join(self.base_dir, 'test_20180101_000000.tif')))
+@@ -1720,6 +1720,13 @@ class TestSceneSaving(unittest.TestCase):
+ assert os.path.isfile(os.path.join(self.base_dir, 'test_20180101_000000.tif'))
+try:
@@ -27,11 +27,11 @@ index 2ff5e90..562175a 100644
"""Test Scene conversion to geoviews, xarray, etc."""
diff --git a/setup.py b/setup.py
-index 1e38567..95140b9 100644
+index 64fdb06..68b9237 100644
--- a/setup.py
+++ b/setup.py
-@@ -35,7 +35,7 @@ requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.11.0', 'trollsift',
- 'dask[array] >=0.17.1', 'pyproj', 'zarr']
+@@ -36,7 +36,7 @@ requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.11.0', 'trollsift',
+ 'pooch']
test_requires = ['behave', 'h5py', 'netCDF4', 'pyhdf', 'imageio', 'libtiff',
- 'rasterio', 'geoviews', 'trollimage', 'fsspec']
@@ -39,9 +39,9 @@ index 1e38567..95140b9 100644
extras_require = {
# Readers:
-@@ -71,7 +71,7 @@ extras_require = {
+@@ -72,7 +72,7 @@ extras_require = {
# Documentation:
- 'doc': ['sphinx'],
+ 'doc': ['sphinx', 'sphinx_rtd_theme', 'sphinxcontrib-apidoc'],
# Other
- 'geoviews': ['geoviews'],
+ #'geoviews': ['geoviews'],
=====================================
debian/patches/0002-No-setuptools-scm.patch
=====================================
@@ -5,16 +5,16 @@ Subject: No setuptools-scm
Forwarded: non-needed
---
doc/source/conf.py | 16 +++++++++++-----
- satpy/__init__.py | 2 +-
+ pyproject.toml | 7 ++++---
setup.cfg | 8 ++++----
- setup.py | 17 +++++++++--------
- 4 files changed, 25 insertions(+), 18 deletions(-)
+ setup.py | 19 ++++++++++---------
+ 4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 2dd716d..c722d7a 100644
+index 8a2c5d7..42bd2bc 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -31,11 +31,17 @@ sys.path.append(os.path.abspath(os.path.dirname(__file__)))
+@@ -28,11 +28,17 @@ sys.path.append(os.path.abspath(os.path.dirname(__file__)))
# |version| and |release|, also used in various other places throughout the
# built documents.
#
@@ -37,21 +37,23 @@ index 2dd716d..c722d7a 100644
class Mock(object): # noqa
-diff --git a/satpy/__init__.py b/satpy/__init__.py
-index 2eae65a..42cf1e0 100644
---- a/satpy/__init__.py
-+++ b/satpy/__init__.py
-@@ -23,7 +23,7 @@ try:
- __version__ = get_distribution(__name__).version
- except DistributionNotFound:
- # package is not installed
-- pass
-+ from .version import version as __version__
-
- CHUNK_SIZE = int(os.getenv('PYTROLL_CHUNK_SIZE', 4096))
+diff --git a/pyproject.toml b/pyproject.toml
+index 4943fe0..61043f1 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,6 @@
+ [build-system]
+-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4", 'setuptools_scm_git_archive']
++requires = ["setuptools>=42", "wheel"]
++# requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4", 'setuptools_scm_git_archive']
+-[tool.setuptools_scm]
+-write_to = "satpy/version.py"
+\ No newline at end of file
++# [tool.setuptools_scm]
++# write_to = "satpy/version.py"
diff --git a/setup.cfg b/setup.cfg
-index 31de3a9..3b209a7 100644
+index 75c0c0d..510ddaf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
@@ -67,7 +69,7 @@ index 31de3a9..3b209a7 100644
[bdist_rpm]
requires=h5py pyresample python2-numexpr pyhdf xarray dask h5netcdf
diff --git a/setup.py b/setup.py
-index 95140b9..f2d191b 100644
+index 68b9237..c648a07 100644
--- a/setup.py
+++ b/setup.py
@@ -22,13 +22,14 @@ from glob import glob
@@ -92,12 +94,14 @@ index 95140b9..f2d191b 100644
requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.11.0', 'trollsift',
'trollimage >1.10.1', 'pykdtree', 'pyyaml', 'xarray >=0.10.1, !=0.13.0',
-@@ -132,7 +133,7 @@ setup(name=NAME,
- os.path.join('etc', 'enhancements', '*.yaml'),
+@@ -145,8 +146,8 @@ setup(name=NAME,
+ 'tests/etc/writers/*.yaml',
]},
zip_safe=False,
-- use_scm_version=True,
-+ use_scm_version=True if setuptools_scm is not None else False,
+- use_scm_version={'write_to': 'satpy/version.py'},
+- setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
++ # use_scm_version={'write_to': 'satpy/version.py'},
++ # setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
install_requires=requires,
tests_require=test_requires,
python_requires='>=3.6',
=====================================
debian/patches/0003-Skip-broken-tests.patch
=====================================
@@ -8,10 +8,10 @@ Forwarded: https://github.com/pytroll/satpy/issues/1316
1 file changed, 3 insertions(+)
diff --git a/satpy/tests/reader_tests/test_avhrr_l1b_gaclac.py b/satpy/tests/reader_tests/test_avhrr_l1b_gaclac.py
-index b020d5f..c47a311 100644
+index be9fbbd..a910f05 100644
--- a/satpy/tests/reader_tests/test_avhrr_l1b_gaclac.py
+++ b/satpy/tests/reader_tests/test_avhrr_l1b_gaclac.py
-@@ -129,6 +129,7 @@ class TestGACLACFile(ModulePatcher):
+@@ -138,6 +138,7 @@ class TestGACLACFile(GACLACFilePatcher):
filename_info = parse(GAC_PATTERN, filename)
return self.GACLACFile(filename, filename_info, {}, **kwargs)
@@ -19,7 +19,7 @@ index b020d5f..c47a311 100644
def test_init(self):
"""Test GACLACFile initialization."""
from pygac.gac_klm import GACKLMReader
-@@ -390,6 +391,7 @@ class TestGACLACFile(ModulePatcher):
+@@ -399,6 +400,7 @@ class TestGACLACFile(GACLACFilePatcher):
fh._get_angle(key)
reader.get_angles.assert_called_once()
@@ -27,7 +27,7 @@ index b020d5f..c47a311 100644
def test_strip_invalid_lat(self):
"""Test stripping invalid coordinates."""
import pygac.utils
-@@ -425,6 +427,7 @@ class TestGACLACFile(ModulePatcher):
+@@ -434,6 +436,7 @@ class TestGACLACFile(GACLACFilePatcher):
self.assertEqual(fh.start_time, datetime(1970, 1, 1, 0, 0, 0, 2))
self.assertEqual(fh.end_time, datetime(1970, 1, 1, 0, 0, 0, 3))
=====================================
debian/rules
=====================================
@@ -7,6 +7,7 @@
include /usr/share/dpkg/pkg-info.mk
export PYBUILD_NAME=satpy
+export PYBUILD_TEST_ARGS=-k "not test_sar_c_safe"
%:
dh $@ --with python3,sphinxdoc --buildsystem=pybuild
=====================================
debian/tests/python3
=====================================
@@ -7,5 +7,5 @@ cd "$AUTOPKGTEST_TMP"
for py in $PYS; do
echo "=== $py ==="
- $py -m unittest -v satpy.tests 2>&1
+ $py -m pytest -v --pyargs satpy -k "not test_sar_c_safe" 2>&1
done
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/c82b92f5aaf87ae3de435e7f514b4aff9cf864d6...e9cc42add69207777b7ff2f5ad1fd1e1b258c21a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/c82b92f5aaf87ae3de435e7f514b4aff9cf864d6...e9cc42add69207777b7ff2f5ad1fd1e1b258c21a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211106/c17467f3/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list