[Git][debian-gis-team/trollimage][upstream] New upstream version 1.10.1

[Antonio Valentino]

Antonio Valentino pushed to branch upstream at Debian GIS Project / trollimage


Commits:
27483868 by Antonio Valentino at 2019-09-30T05:29:46Z
New upstream version 1.10.1
- - - - -


5 changed files:

- .travis.yml
- CHANGELOG.md
- appveyor.yml
- trollimage/version.py
- trollimage/xrimage.py


Changes:

=====================================
.travis.yml
=====================================
@@ -16,7 +16,7 @@ env:
         - CONDA_CHANNEL_PRIORITY=True
 
 install:
-    - git clone --depth 1 git://github.com/astropy/ci-helpers.git
+    - git clone --depth 1 -b all-the-fixes git://github.com/djhoese/ci-helpers.git
     - source ci-helpers/travis/setup_conda.sh
 script: coverage run --source=trollimage setup.py test
 after_success:


=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,14 @@
+## Version 1.10.1 (2019/09/26)
+
+### Pull Requests Merged
+
+#### Bugs fixed
+
+* [PR 56](https://github.com/pytroll/trollimage/pull/56) - Fix WKT version used to convert CRS to GeoTIFF CRS
+
+In this release 1 pull request was closed.
+
+
 ## Version 1.10.0 (2019/09/20)
 
 ### Pull Requests Merged


=====================================
appveyor.yml
=====================================
@@ -19,10 +19,10 @@ environment:
       NUMPY_VERSION: "stable"
 
 install:
-    - "git clone --depth 1 git://github.com/astropy/ci-helpers.git"
+#    - "git clone --depth 1 git://github.com/astropy/ci-helpers.git"
+    - "git clone --depth 1 -b all-the-fixes git://github.com/djhoese/ci-helpers.git"
     - "powershell ci-helpers/appveyor/install-miniconda.ps1"
-    - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-    - "activate test"
+    - "conda activate test"
 
 build: false  # Not a C# project, build stuff at the test step instead.
 


=====================================
trollimage/version.py
=====================================
@@ -23,9 +23,9 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = " (HEAD -> master, tag: v1.10.0)"
-    git_full = "b1fb06cbf6ef8b23e5816c423df1eeaf8e76d606"
-    git_date = "2019-09-20 09:41:02 +0200"
+    git_refnames = " (HEAD -> master, tag: v1.10.1)"
+    git_full = "9130e96fae8e880ccf843298b508712a4d80a481"
+    git_date = "2019-09-26 15:08:59 -0500"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 


=====================================
trollimage/xrimage.py
=====================================
@@ -331,8 +331,12 @@ class XRImage(object):
 
             try:
                 area = data.attrs['area']
+                if rasterio.__gdal_version__ >= '3':
+                    wkt_version = 'WKT2_2018'
+                else:
+                    wkt_version = 'WKT1_GDAL'
                 if hasattr(area, 'crs'):
-                    crs = rasterio.crs.CRS.from_wkt(area.crs.to_wkt())
+                    crs = rasterio.crs.CRS.from_wkt(area.crs.to_wkt(version=wkt_version))
                 else:
                     crs = rasterio.crs.CRS(data.attrs['area'].proj_dict)
                 west, south, east, north = data.attrs['area'].area_extent



View it on GitLab: https://salsa.debian.org/debian-gis-team/trollimage/commit/2748386843c062af485f7b3833c925e0098fd58f

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/trollimage/commit/2748386843c062af485f7b3833c925e0098fd58f
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/20190930/c01e37b7/attachment-0001.html>