[Git][debian-gis-team/satpy][master] 2 commits: New pygat syntax

[Antonio Valentino]

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


Commits:
a063ff1e by Antonio Valentino at 2020-02-15T08:57:02+01:00
New pygat syntax

- - - - -
b451b0ca by Antonio Valentino at 2020-02-15T07:57:38+00:00
Set distribution to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0005-New-pygac-syntax.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+satpy (0.19.1-3) unstable; urgency=medium
+
+  * debian/patches
+    - new 0005-New-pygac-syntax.patch (Closes: 949468)
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 15 Feb 2020 07:57:21 +0000
+
 satpy (0.19.1-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.5.0, no changes.


=====================================
debian/patches/0005-New-pygac-syntax.patch
=====================================
@@ -0,0 +1,25 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 15 Feb 2020 08:50:31 +0100
+Subject: New pygac syntax
+
+---
+ satpy/readers/hrpt.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/satpy/readers/hrpt.py b/satpy/readers/hrpt.py
+index 31f5988..5b178c4 100644
+--- a/satpy/readers/hrpt.py
++++ b/satpy/readers/hrpt.py
+@@ -33,8 +33,11 @@ import logging
+ from datetime import datetime
+ 
+ import numpy as np
++try:
++    from pygac.calibration import calibrate_solar, calibrate_thermal
++except ImportError:
++    from pygac.gac_calibration import calibrate_solar, calibrate_thermal
+ 
+-from pygac.gac_calibration import calibrate_solar, calibrate_thermal
+ from satpy.dataset import Dataset
+ from satpy.readers.file_handlers import BaseFileHandler
+ 


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 0002-No-setuptools-scm.patch
 0003-Skip-broken-tests.patch
 0004-xarray-0.15-compat.patch
+0005-New-pygac-syntax.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/compare/2127b8a4dae2b7cc91729cf647551ec8e18e9ffd...b451b0cacf8c68a22fe6550c93bd05121e1d6f4c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/compare/2127b8a4dae2b7cc91729cf647551ec8e18e9ffd...b451b0cacf8c68a22fe6550c93bd05121e1d6f4c
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/20200215/b919ffa0/attachment-0001.html>