[pyosmium] 01/07: Imported Upstream version 2.11.0
Bas Couwenberg
sebastic at debian.org
Sun Jan 15 20:58:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pyosmium.
commit b7388129cc8e9defd329336a3649fd8e1c2a6303
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jan 15 21:44:51 2017 +0100
Imported Upstream version 2.11.0
---
CHANGELOG.md | 13 +++++++++++--
doc/conf.py | 2 +-
doc/ref_geom.rst | 1 +
lib/osm.cc | 3 ++-
osmium/version.py | 6 +++---
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75170a3..ddc9423 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,13 +13,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
+## [2.11.0] - 2017-01-15
+
+### Changed
+
+- Use current libosmium
+
+
## [2.10.2] - 2016-11-16
### Added
- support for sdist creation (now published via Pypi)
- custom locations for libosmium and boost can be set via the
- environment variables LIBOSMIUM_PREFIX and BOOST_PREFIX.
+ environment variables `LIBOSMIUM_PREFIX` and `BOOST_PREFIX`.
- export bounding box from osmium::io::Header
### Changed
@@ -116,7 +123,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Exception not caught in test.
-[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.9.0...HEAD
+[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.11.0...HEAD
+[2.11.0]: https://github.com/osmcode/pyosmium/compare/v2.10.2...v2.11.0
+[2.10.2]: https://github.com/osmcode/pyosmium/compare/v2.9.0...v2.10.2
[2.9.0]: https://github.com/osmcode/pyosmium/compare/v2.8.0...v2.9.0
[2.8.0]: https://github.com/osmcode/pyosmium/compare/v2.7.1...v2.8.0
[2.7.1]: https://github.com/osmcode/pyosmium/compare/v2.6.0...v2.7.1
diff --git a/doc/conf.py b/doc/conf.py
index 272692d..850c539 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -65,7 +65,7 @@ master_doc = 'index'
# General information about the project.
project = 'Pyosmium'
-copyright = '2015-2016, Sarah Hoffmann'
+copyright = '2015-2017, Sarah Hoffmann'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff --git a/doc/ref_geom.rst b/doc/ref_geom.rst
index 8886237..0ac9ff4 100644
--- a/doc/ref_geom.rst
+++ b/doc/ref_geom.rst
@@ -2,6 +2,7 @@
------------------------------------
This module provides various helper functions for geometry handling.
+Note: remember to apply a location handler before in order to use these geometry utilities on node locations.
Geometry Factories
^^^^^^^^^^^^^^^^^^
diff --git a/lib/osm.cc b/lib/osm.cc
index 8f126c6..f9b8425 100644
--- a/lib/osm.cc
+++ b/lib/osm.cc
@@ -170,7 +170,8 @@ BOOST_PYTHON_MODULE(_osm)
"is normally not used directly, use one of its subclasses instead.",
no_init)
.def("__len__", &osmium::NodeRefList::size)
- .def("__getitem__", &osmium::NodeRefList::operator[], return_value_policy<reference_existing_object>())
+ .def("__getitem__",
+ make_function(static_cast<const osmium::NodeRef& (osmium::NodeRefList::*)(osmium::NodeRefList::size_type) const>(&osmium::NodeRefList::operator[]), return_value_policy<reference_existing_object>()))
.def("__iter__", iterator<osmium::NodeRefList,return_internal_reference<>>())
.def("is_closed", &osmium::NodeRefList::is_closed, args("self"),
"True if the start and end node are the same (synonym for "
diff --git a/osmium/version.py b/osmium/version.py
index 4ecc7e0..92b5eb9 100644
--- a/osmium/version.py
+++ b/osmium/version.py
@@ -3,9 +3,9 @@ Version information.
"""
# the major version
-pyosmium_major = '2.10'
+pyosmium_major = '2.11'
# current release (Pip version)
-pyosmium_release = '2.10.2'
+pyosmium_release = '2.11.0'
# libosmium version shipped with the Pip release
-libosmium_version = '2.10.2'
+libosmium_version = '2.11.0'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.git
More information about the Pkg-grass-devel
mailing list