[Git][debian-gis-team/pyosmium][upstream] New upstream version 3.0.1

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / pyosmium


Commits:
57beac30 by Bas Couwenberg at 2020-07-25T20:04:33+02:00
New upstream version 3.0.1
- - - - -


4 changed files:

- CHANGELOG.md
- lib/cast.h
- src/osmium/osm/mutable.py
- src/osmium/version.py


Changes:

=====================================
CHANGELOG.md
=====================================
@@ -4,6 +4,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.1] - 2020-07-25
+
+### Added
+
+- allow to set user in mutable object
+
+### Changed
+
+- use current libosmium and protozero
+
+### Fixed
+
+- avoid leaking Python handle in timestamp conversion
+
 ## [3.0.0] - 2020-05-03
 
 ### Added


=====================================
lib/cast.h
=====================================
@@ -41,18 +41,19 @@ namespace pybind11 { namespace detail {
 
             std::time_t tt = src.seconds_since_epoch();
             std::tm localtime = *std::gmtime(&tt);
-
             handle pydate = PyDateTime_FromDateAndTime(localtime.tm_year + 1900,
-                                                     localtime.tm_mon + 1,
-                                                     localtime.tm_mday,
-                                                     localtime.tm_hour,
-                                                     localtime.tm_min,
-                                                     localtime.tm_sec,
-                                                     0);
-
-            auto utc = pybind11::module::import("datetime").attr("timezone").attr("utc");
-            using namespace pybind11::literals;
-            return pydate.attr("replace")("tzinfo"_a=utc).inc_ref();
+                                                       localtime.tm_mon + 1,
+                                                       localtime.tm_mday,
+                                                       localtime.tm_hour,
+                                                       localtime.tm_min,
+                                                       localtime.tm_sec,
+                                                       0);
+
+            static auto utc = module::import("datetime").attr("timezone").attr("utc");
+            using namespace literals;
+            handle with_utc = pydate.attr("replace")("tzinfo"_a=utc).inc_ref();
+            pydate.dec_ref();
+            return with_utc;
         }
 
         PYBIND11_TYPE_CASTER(type, _("datetime.datetime"));


=====================================
src/osmium/osm/mutable.py
=====================================
@@ -10,7 +10,7 @@ class OSMObject(object):
     """
 
     def __init__(self, base=None, id=None, version=None, visible=None, changeset=None,
-            timestamp=None, uid=None, tags=None):
+            timestamp=None, uid=None, tags=None, user=None):
         if base is None:
             self.id = id
             self.version = version
@@ -19,6 +19,7 @@ class OSMObject(object):
             self.timestamp = timestamp
             self.uid = uid
             self.tags = tags
+            self.user = user
         else:
             self.id = base.id if id is None else id
             self.version = base.version if version is None else version
@@ -27,6 +28,7 @@ class OSMObject(object):
             self.timestamp = base.timestamp if timestamp is None else timestamp
             self.uid = base.uid if uid is None else uid
             self.tags = base.tags if tags is None else tags
+            self.user = base.user if user is None else user
 
 
 class Node(OSMObject):


=====================================
src/osmium/version.py
=====================================
@@ -5,11 +5,11 @@ Version information.
 # the major version
 pyosmium_major = '3.0'
 # current release (Pip version)
-pyosmium_release = '3.0.0'
+pyosmium_release = '3.0.1'
 
 # libosmium version shipped with the Pip release
-libosmium_version = '2.15.5'
+libosmium_version = '2.15.6'
 # protozero version shipped with the Pip release
-protozero_version = '1.6.8'
+protozero_version = '1.7.0'
 # pybind11 version shipped with the Pip release
 pybind11_version = '2.5.0'



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/commit/57beac308a38ed39b1d3e2cecadb8a05a8aa1ab3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/commit/57beac308a38ed39b1d3e2cecadb8a05a8aa1ab3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200725/63efccdc/attachment-0001.html>