Skip to content
Commits on Source (4)
......@@ -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:
......
## 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
......
......@@ -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 (1.10.1-1) unstable; urgency=medium
* New upstream release.
-- Antonio Valentino <antonio.valentino@tiscali.it> Mon, 30 Sep 2019 05:33:09 +0000
trollimage (1.10.0-1) unstable; urgency=medium
* New upstream release.
......
......@@ -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
......
......@@ -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
......