[Git][debian-gis-team/satpy][master] 4 commits: Do not insatll Python code that is not part of the satpy package

[Antonio Valentino (@antonio.valentino)]

Antonio Valentino pushed to branch master at Debian GIS Project / satpy


Commits:
1a45a2a9 by Antonio Valentino at 2021-11-09T10:43:59+00:00
Do not insatll Python code that is not part of the satpy package

- - - - -
e3921cf4 by Antonio Valentino at 2021-11-09T10:54:18+00:00
Do not use undefined substitution variables in d/control

- - - - -
dd3e9747 by Antonio Valentino at 2021-11-09T11:09:40+00:00
Improve 0002-No-setuptools-scm.patch

- - - - -
46f0360d by Antonio Valentino at 2021-11-09T11:09:47+00:00
Set distribution to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/0002-No-setuptools-scm.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+satpy (0.31.0-2) unstable; urgency=medium
+
+  * debian/rules:
+    - do not install python code that is not part of the satpy
+      package (Closes: #998822).
+  * debian/control:
+    - do not use undefined substitution variables.
+  * debian/patches:
+    - improve 0002-No-setuptools-scm.patch to properly set the version
+      in the setup.py script.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Tue, 09 Nov 2021 11:08:48 +0000
+
 satpy (0.31.0-1) unstable; urgency=medium
 
   [ Bas Couwenberg ]


=====================================
debian/control
=====================================
@@ -111,8 +111,7 @@ Recommends: libjs-mathjax,
             python3-tables,
             python3-tornado,
             python3-trollsched,
-            ${python3:Recommends}
-Suggests: ${python3:Suggests}
+Suggests: www-browser
 Description: Python package for earth-observing satellite data processing
  The SatPy package is a Python library for reading and manipulating
  meteorological remote sensing data and writing it to various image and


=====================================
debian/patches/0002-No-setuptools-scm.patch
=====================================
@@ -7,8 +7,8 @@ Forwarded: non-needed
  doc/source/conf.py | 16 +++++++++++-----
  pyproject.toml     |  7 ++++---
  setup.cfg          |  8 ++++----
- setup.py           | 14 +++++++-------
- 4 files changed, 26 insertions(+), 19 deletions(-)
+ setup.py           | 19 ++++++++++++-------
+ 4 files changed, 31 insertions(+), 19 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index dea875f..c2ab077 100644
@@ -70,7 +70,7 @@ index b43fb02..c359010 100644
  [bdist_rpm]
  requires=h5py pyresample python2-numexpr pyhdf xarray dask h5netcdf
 diff --git a/setup.py b/setup.py
-index 0552518..ff4d4a4 100644
+index 0552518..e084660 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -22,13 +22,13 @@ from glob import glob
@@ -94,3 +94,17 @@ index 0552518..ff4d4a4 100644
  
  requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.11.0', 'trollsift',
              'trollimage >1.10.1', 'pykdtree', 'pyyaml', 'xarray >=0.10.1, !=0.13.0',
+@@ -120,8 +120,13 @@ entry_points = {
+ NAME = 'satpy'
+ with open('README.rst', 'r') as readme:
+     README = readme.read()
++try:
++    from satpy import __version__ as VERSION
++except ImportError:
++    VERSION = '0.0.0'
+ 
+ setup(name=NAME,
++      version=VERSION,
+       description='Python package for earth-observing satellite data processing',
+       long_description=README,
+       author='The Pytroll Team',


=====================================
debian/rules
=====================================
@@ -7,6 +7,7 @@
 include /usr/share/dpkg/pkg-info.mk
 
 export PYBUILD_NAME=satpy
+export PYBUILD_AFTER_INSTALL=rm -rf '{destdir}/{install_dir}/benchmarks' '{destdir}/{install_dir}/dask-worker-space'
 export PYBUILD_TEST_ARGS=-k \
 "not test_retrieve and not test_offline_retrieve and\
  not test_retrieve_all and not test_download_script"



View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/d22f0f7fb2653cc317ef4a1c0b7e554ca2c0afc8...46f0360dee1fd9c79588883457fcdb1dd6693932

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/d22f0f7fb2653cc317ef4a1c0b7e554ca2c0afc8...46f0360dee1fd9c79588883457fcdb1dd6693932
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/20211109/4d6a10e1/attachment-0001.htm>