[Git][debian-gis-team/pyosmium][master] 7 commits: New upstream version 3.0.1
Bas Couwenberg
gitlab at salsa.debian.org
Sat Jul 25 19:35:52 BST 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / pyosmium
Commits:
57beac30 by Bas Couwenberg at 2020-07-25T20:04:33+02:00
New upstream version 3.0.1
- - - - -
e413c26a by Bas Couwenberg at 2020-07-25T20:04:37+02:00
Update upstream source from tag 'upstream/3.0.1'
Update to upstream version '3.0.1'
with Debian dir 0559732e2550cd60d9785b3bef590010fb9ef221
- - - - -
8972c215 by Bas Couwenberg at 2020-07-25T20:04:56+02:00
New upstream release.
- - - - -
46ea7a01 by Bas Couwenberg at 2020-07-25T20:06:32+02:00
Bump minimum required libosmium2-dev to 2.15.6.
- - - - -
c173a8aa by Bas Couwenberg at 2020-07-25T20:25:03+02:00
Use JavaScript files from libjs-sphinxdoc.
- - - - -
f3080f32 by Bas Couwenberg at 2020-07-25T20:25:03+02:00
Add lintian override for hardening-no-fortify-functions.
- - - - -
f85040dc by Bas Couwenberg at 2020-07-25T20:25:03+02:00
Set distribution to unstable.
- - - - -
10 changed files:
- CHANGELOG.md
- debian/changelog
- debian/control
- debian/pyosmium-doc.links
- + debian/pyosmium-doc.lintian-overrides
- + debian/python3-pyosmium.lintian-overrides
- debian/rules
- 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
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+pyosmium (3.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump minimum required libosmium2-dev to 2.15.6.
+ * Use JavaScript files from libjs-sphinxdoc.
+ * Add lintian override for hardening-no-fortify-functions.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 25 Jul 2020 20:06:36 +0200
+
pyosmium (3.0.0-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: cmake (>= 2.8.12),
libexpat1-dev,
libgdal-dev,
libgeos++-dev,
- libosmium2-dev (>= 2.15.4),
+ libosmium2-dev (>= 2.15.6),
libsparsehash-dev,
pybind11-dev,
python3-all-dev,
@@ -68,6 +68,7 @@ Package: pyosmium-doc
Architecture: all
Section: doc
Depends: libjs-jquery,
+ libjs-sphinxdoc,
libjs-underscore,
${misc:Depends}
Description: Osmium library bindings for Python - Documentation
=====================================
debian/pyosmium-doc.links
=====================================
@@ -1,2 +1,4 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/pyosmium-doc/html/_static/jquery.js
-usr/share/javascript/underscore/underscore.js usr/share/doc/pyosmium-doc/html/_static/underscore.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/pyosmium-doc/html/_static/jquery.js
+usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/doc/pyosmium-doc/html/_static/doctools.js
+usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/pyosmium-doc/html/_static/searchtools.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/pyosmium-doc/html/_static/underscore.js
=====================================
debian/pyosmium-doc.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# sphinx does not provide language_data.js
+embedded-javascript-library */language_data.js please use sphinx
+
=====================================
debian/python3-pyosmium.lintian-overrides
=====================================
@@ -0,0 +1,4 @@
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+# Fortify Source functions: no, only unprotected functions found!
+hardening-no-fortify-functions *
+
=====================================
debian/rules
=====================================
@@ -41,5 +41,9 @@ override_dh_install:
# Remove embedded jquery.js in favor of libjs-jquery
$(RM) debian/*/usr/share/doc/*/html/_static/jquery.js
+ # Remove embedded doctools.js & searchtools.js in favor of libjs-sphinxdoc
+ $(RM) debian/*/usr/share/doc/*/html/_static/doctools.js
+ $(RM) debian/*/usr/share/doc/*/html/_static/searchtools.js
+
# Remove embedded underscore.js in favor of libjs-underscore
$(RM) debian/*/usr/share/doc/*/html/_static/underscore.js
=====================================
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/-/compare/ef24b08ed60a1272caf2fba9d9bfd5900e709f54...f85040dc448296223e67ab0a75cf75b7526b8be5
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/compare/ef24b08ed60a1272caf2fba9d9bfd5900e709f54...f85040dc448296223e67ab0a75cf75b7526b8be5
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/a3b38de8/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list