This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository rasterio.
commit 35a7b2a7310e11080550c5f02fe216afcbab7d39 Author: Johan Van de Wauw <jo...@vandewauw.be> Date: Thu Oct 15 10:33:28 2015 +0200 Imported Upstream version 0.28.0 --- CHANGES.txt | 6 ++++++ rasterio/__init__.py | 2 +- rasterio/_base.pyx | 4 ++-- setup.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 01ea66e..03326b6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Changes ======= +0.28.0 (2015-10-06) +------------------- +- Ensure that tools module is packaged (#489, #490). The rio-merge command was + broken in 0.27.0 and is restored to working order in version 0.28.0. +- Add `precision` keyword argument to `index()` method (#492). + 0.27.0 (2015-09-25) ------------------- - Ensure local uniqueness of the rio-shapes feature ids (#479). diff --git a/rasterio/__init__.py b/rasterio/__init__.py index 11934fd..0460125 100644 --- a/rasterio/__init__.py +++ b/rasterio/__init__.py @@ -23,7 +23,7 @@ from rasterio import _err, coords, enums __all__ = [ 'band', 'open', 'drivers', 'copy', 'pad'] -__version__ = "0.27.0" +__version__ = "0.28.0" log = logging.getLogger('rasterio') class NullHandler(logging.Handler): diff --git a/rasterio/_base.pyx b/rasterio/_base.pyx index 422db77..a5ef369 100644 --- a/rasterio/_base.pyx +++ b/rasterio/_base.pyx @@ -389,9 +389,9 @@ cdef class DatasetReader(object): row += self.height return c+a*col, f+e*row - def index(self, x, y, op=math.floor): + def index(self, x, y, op=math.floor, precision=6): """Returns the (row, col) index of the pixel containing (x, y).""" - return get_index(x, y, self.affine) + return get_index(x, y, self.affine, op=op, precision=precision) def window(self, left, bottom, right, top, boundless=False): """Returns the window corresponding to the world bounding box. diff --git a/setup.py b/setup.py index fe4cf4d..ed3b07f 100755 --- a/setup.py +++ b/setup.py @@ -227,7 +227,7 @@ setup_args = dict( url='https://github.com/mapbox/rasterio', license='BSD', package_dir={'': '.'}, - packages=['rasterio', 'rasterio.rio'], + packages=['rasterio', 'rasterio.rio', 'rasterio.tools'], entry_points=''' [console_scripts] rio=rasterio.rio.main:main_group -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/rasterio.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel