[pyresample] 01/04: New upstream version 1.8.2
Antonio Valentino
a_valentino-guest at moszumanska.debian.org
Sat Mar 3 17:21:58 UTC 2018
This is an automated email from the git hooks/post-receive script.
a_valentino-guest pushed a commit to branch master
in repository pyresample.
commit 89099bba0b7152cf825910c3cc2e3d76ad5386f2
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Sat Mar 3 17:10:25 2018 +0000
New upstream version 1.8.2
---
.bumpversion.cfg | 2 +-
changelog.rst | 22 +++++++++++++++++++---
pyresample/geometry.py | 17 ++++++++++++-----
pyresample/kd_tree.py | 1 +
pyresample/version.py | 2 +-
5 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d50a490..ab21604 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.8.1
+current_version = 1.8.2
commit = True
tag = True
diff --git a/changelog.rst b/changelog.rst
index a159ed6..7a105eb 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -2,6 +2,17 @@ Changelog
=========
+v1.8.2 (2018-03-01)
+-------------------
+- update changelog. [davidh-ssec]
+- Bump version: 1.8.1 → 1.8.2. [davidh-ssec]
+- Merge pull request #104 from pytroll/bugfix-chunk-size. [David Hoese]
+
+ Allow chunk size in dask methods to be 2D
+- Fix line too long. [davidh-ssec]
+- Fix chunk size 'get_proj_vectors_dask' so it can be 2D. [davidh-ssec]
+
+
v1.8.1 (2018-02-22)
-------------------
- update changelog. [Martin Raspaud]
@@ -727,6 +738,7 @@ v1.2.2 (2016-06-21)
Without this, the compilation of the ewa extension crashes.
+
v1.2.1 (2016-06-21)
-------------------
- update changelog. [Martin Raspaud]
@@ -882,9 +894,11 @@ v1.2.0 (2016-06-17)
- Make kd_tree test work on older numpy version. [Martin Raspaud]
VisibleDeprecationWarning is not available in numpy <1.9.
+
- Adapt to newest pykdtree version. [Martin Raspaud]
The kdtree object's attribute `data_pts` has been renamed to `data`.
+
- Run tests on python 3.5 in travis also. [Martin Raspaud]
@@ -896,6 +910,7 @@ v1.1.6 (2016-02-25)
A previous commit was looking for a 'data_pts' attribute in the kdtree
object, which is available in pykdtree, but not scipy.
+
- Merge pull request #32 from mitkin/master. [Martin Raspaud]
[tests] Skip deprecation warnings in test_gauss_multi_uncert
@@ -907,6 +922,7 @@ v1.1.6 (2016-02-25)
The latest matplotlib (1.5) doesn't support python 2.6 and 3.3. This patch
chooses the right matplotlib version to install depending on the python
version at hand.
+
- Skip deprecation warnings. [Mikhail Itkin]
Catch the rest of the warnings. Check if there is only one, and
@@ -948,6 +964,7 @@ Other
- Bugfix to address a numpy DeprecationWarning. [Martin Raspaud]
Numpy won't take non-integer indices soon, so make index an int.
+
- Merge branch 'release-1.1.3' [Martin Raspaud]
- Merge branch 'licence-lgpl' into pre-master. [Martin Raspaud]
- Switch to lgplv3, and bump up version number. [Martin Raspaud]
@@ -1169,7 +1186,7 @@ Other
- Set svn:mime-type. [StorPipfugl]
- Corrected doc errors. [StorPipfugl]
- Removed dist dir. [StorPipfugl]
-- No commit message. [StorPipfugl]
+- [StorPipfugl]
- Updated documentation. New release. [StorPipfugl]
- Started updating docstrings. [StorPipfugl]
- Restructured API. [StorPipfugl]
@@ -1182,9 +1199,8 @@ Other
- Removed unneeded function. [StorPipfugl]
- Mime types set. [StorPipfugl]
- Mime types set. [StorPipfugl]
-- No commit message. [StorPipfugl]
+- [StorPipfugl]
- Moved to Google Code under GPLv3 license. [StorPipfugl]
- moved to Google Code. [StorPipfugl]
-
diff --git a/pyresample/geometry.py b/pyresample/geometry.py
index 8efa8f6..b58d3cc 100644
--- a/pyresample/geometry.py
+++ b/pyresample/geometry.py
@@ -1044,9 +1044,16 @@ class AreaDefinition(BaseDefinition):
if dtype is None:
dtype = self.dtype
- target_x = da.arange(self.x_size, chunks=chunks, dtype=dtype) * \
+ if not isinstance(chunks, int):
+ y_chunks = chunks[0]
+ x_chunks = chunks[1]
+ else:
+ y_chunks = chunks
+ x_chunks = chunks
+
+ target_x = da.arange(self.x_size, chunks=x_chunks, dtype=dtype) * \
self.pixel_size_x + self.pixel_upper_left[0]
- target_y = da.arange(self.y_size, chunks=chunks, dtype=dtype) * - \
+ target_y = da.arange(self.y_size, chunks=y_chunks, dtype=dtype) * - \
self.pixel_size_y + self.pixel_upper_left[1]
return target_x, target_y
@@ -1225,11 +1232,11 @@ class AreaDefinition(BaseDefinition):
target_proj = Proj(**self.proj_dict)
def invproj(data1, data2):
+ # XXX: does pyproj copy arrays? What can we do so it doesn't?
return np.dstack(target_proj(data1, data2, inverse=True))
- res = map_blocks(invproj, target_x, target_y, chunks=(target_x.chunks[0],
- target_x.chunks[1],
- 2),
+ res = map_blocks(invproj, target_x, target_y,
+ chunks=(target_x.chunks[0], target_x.chunks[1], 2),
new_axis=[2])
return res[:, :, 0], res[:, :, 1]
diff --git a/pyresample/kd_tree.py b/pyresample/kd_tree.py
index fe27a53..b8d786a 100644
--- a/pyresample/kd_tree.py
+++ b/pyresample/kd_tree.py
@@ -1091,6 +1091,7 @@ class XArrayResamplerNN(object):
mask_2d_added = False
coords = {}
try:
+ # FIXME: Use same chunk size as input data
coord_x, coord_y = self.target_geo_def.get_proj_vectors_dask()
except AttributeError:
coord_x, coord_y = None, None
diff --git a/pyresample/version.py b/pyresample/version.py
index 052f1f5..b8f3e31 100644
--- a/pyresample/version.py
+++ b/pyresample/version.py
@@ -15,4 +15,4 @@
# You should have received a copy of the GNU Lesser General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.8.1'
+__version__ = '1.8.2'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyresample.git
More information about the Pkg-grass-devel
mailing list