Release v2.15.3

osmcode · Aug 16, 2019 · fb4ce3a · fb4ce3a
1 parent 6714735
commit fb4ce3a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.15.3] - 2019-08-16
+
+### Added
+
+- `make_simple_handler()` convenience wrapper
+- iterator for Tag type (for allowing to convert TagLists into python dicts)
+- tests for examples
+- tests for MP building and MergeInputReader
+
+### Changed
+
+- use current libosmium and protozero
+
+### Fixed
+
+- remove spurious 404 error message when downloading OSM diffs
+
 ## [2.15.2] - 2019-03-09
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(pyosmium)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-find_package(Osmium 2.14 REQUIRED COMPONENTS io pbf xml)
+find_package(Osmium 2.15 REQUIRED COMPONENTS io pbf xml)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib)
 

diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
@@ -71,6 +71,9 @@ find_path(OSMIUM_INCLUDE_DIR osmium/version.hpp
 
 # Check libosmium version number
 if(Osmium_FIND_VERSION)
+    if(NOT EXISTS "${OSMIUM_INCLUDE_DIR}/osmium/version.hpp")
+        message(FATAL_ERROR "Missing ${OSMIUM_INCLUDE_DIR}/osmium/version.hpp. Either your libosmium version is too old, or libosmium wasn't found in the place you said.")
+    endif()
     file(STRINGS "${OSMIUM_INCLUDE_DIR}/osmium/version.hpp" _libosmium_version_define REGEX "#define LIBOSMIUM_VERSION_STRING")
     if("${_libosmium_version_define}" MATCHES "#define LIBOSMIUM_VERSION_STRING \"([0-9.]+)\"")
         set(_libosmium_version "${CMAKE_MATCH_1}")
@@ -111,7 +114,7 @@ endif()
 if(Osmium_USE_PBF)
     find_package(ZLIB)
     find_package(Threads)
-    find_package(Protozero 1.5.1)
+    find_package(Protozero 1.6.3)
 
     list(APPEND OSMIUM_EXTRA_FIND_VARS ZLIB_FOUND Threads_FOUND PROTOZERO_INCLUDE_DIR)
     if(ZLIB_FOUND AND Threads_FOUND AND PROTOZERO_FOUND)
@@ -324,7 +327,7 @@ if(MSVC)
     add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
-if(APPLE)
+if(APPLE AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 # following only available from cmake 2.8.12:
 #   add_compile_options(-stdlib=libc++)
 # so using this instead:

diff --git a/src/osmium/version.py b/src/osmium/version.py
@@ -5,11 +5,11 @@
 # the major version
 pyosmium_major = '2.15'
 # current release (Pip version)
-pyosmium_release = '2.15.2'
+pyosmium_release = '2.15.3'
 
 # libosmium version shipped with the Pip release
-libosmium_version = '2.15.1'
+libosmium_version = '2.15.2'
 # protozero version shipped with the Pip release
-protozero_version = '1.6.7'
+protozero_version = '1.6.8'
 # pybind11 version shipped with the Pip release
-pybind11_version = '2.2.4'
+pybind11_version = '2.3.0'