Bug#873332: stretch-pu: package pyosmium/2.11.3-1
Control: tags -1 + pending On Fri, 2017-11-17 at 12:15 +0100, Sebastiaan Couwenberg wrote: > On 11/17/2017 11:50 AM, Julien Cristau wrote: > > On Sat, Aug 26, 2017 at 17:43:26 +0200, Bas Couwenberg wrote: > > > > > diff -Nru pyosmium-2.11.1/debian/changelog pyosmium- > > > 2.11.3/debian/changelog > > > --- pyosmium-2.11.1/debian/changelog 2017-05-05 > > > 09:51:21.0 +0200 > > > +++ pyosmium-2.11.3/debian/changelog 2017-08-26 > > > 15:10:04.0 +0200 > > > @@ -1,3 +1,11 @@ > > > +pyosmium (2.11.3-1) stretch; urgency=medium > > > + > > > + * New upstream bugfix release. > > > +- handler functions not called when using replication > > > service (#38) > > > +- handler functions not called when using Reader instead of > > > file > > > + > > > + -- Bas CouwenbergSat, 26 Aug 2017 > > > 15:10:04 +0200 > > > + > > > > Go ahead. > > Thanks, uploaded. Flagged for acceptance. Regards, Adam
Bug#873332: stretch-pu: package pyosmium/2.11.3-1
On 11/17/2017 11:50 AM, Julien Cristau wrote: > On Sat, Aug 26, 2017 at 17:43:26 +0200, Bas Couwenberg wrote: > >> diff -Nru pyosmium-2.11.1/debian/changelog pyosmium-2.11.3/debian/changelog >> --- pyosmium-2.11.1/debian/changelog 2017-05-05 09:51:21.0 +0200 >> +++ pyosmium-2.11.3/debian/changelog 2017-08-26 15:10:04.0 +0200 >> @@ -1,3 +1,11 @@ >> +pyosmium (2.11.3-1) stretch; urgency=medium >> + >> + * New upstream bugfix release. >> +- handler functions not called when using replication service (#38) >> +- handler functions not called when using Reader instead of file >> + >> + -- Bas CouwenbergSat, 26 Aug 2017 15:10:04 +0200 >> + > > Go ahead. Thanks, uploaded. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
Bug#873332: stretch-pu: package pyosmium/2.11.3-1
Control: tags -1 confirmed On Sat, Aug 26, 2017 at 17:43:26 +0200, Bas Couwenberg wrote: > diff -Nru pyosmium-2.11.1/debian/changelog pyosmium-2.11.3/debian/changelog > --- pyosmium-2.11.1/debian/changelog 2017-05-05 09:51:21.0 +0200 > +++ pyosmium-2.11.3/debian/changelog 2017-08-26 15:10:04.0 +0200 > @@ -1,3 +1,11 @@ > +pyosmium (2.11.3-1) stretch; urgency=medium > + > + * New upstream bugfix release. > +- handler functions not called when using replication service (#38) > +- handler functions not called when using Reader instead of file > + > + -- Bas CouwenbergSat, 26 Aug 2017 15:10:04 +0200 > + Go ahead. Cheers, Julien
Bug#873332: stretch-pu: package pyosmium/2.11.3-1
On Fri, Sep 15, 2017 at 09:21:06PM +0200, Sebastiaan Couwenberg wrote: > On 09/09/2017 03:42 PM, Julien Cristau wrote: > > On Sat, Aug 26, 2017 at 17:43:26 +0200, Bas Couwenberg wrote: > > > >> Upstream has released a new stable release of pyosmium fixing important > >> bugs which I'd like to propose for inclusion in the next stable update. > >> > >> Kind Regards, > >> > >> Bas > > > >> diff -Nru pyosmium-2.11.1/debian/changelog pyosmium-2.11.3/debian/changelog > >> --- pyosmium-2.11.1/debian/changelog 2017-05-05 09:51:21.0 > >> +0200 > >> +++ pyosmium-2.11.3/debian/changelog 2017-08-26 15:10:04.0 > >> +0200 > >> @@ -1,3 +1,11 @@ > >> +pyosmium (2.11.3-1) stretch; urgency=medium > >> + > >> + * New upstream bugfix release. > >> +- handler functions not called when using replication service (#38) > >> +- handler functions not called when using Reader instead of file > >> + > >> + -- Bas CouwenbergSat, 26 Aug 2017 15:10:04 +0200 > >> + > >> pyosmium (2.11.1-1) unstable; urgency=medium > >> > >>* New upstream bugfix release. > > > > Can you elaborate on the user or reverse-dependency impact of those > > bugs, and what are the risks and mitigations for the changes you're > > proposing? Are there any related automated or manual tests? > > pyosmium doesn't have reverse dependencies (yet), it does have some > users. For these issues there are no tests. > > I've added one of the upstream authors to the CC, who can hopefully > elaborate further. 2.11.1 fixed an important bug affecting all users. That's already in stable. Unfortunately there were two (smaller) bugs in the fix which are now fixed in 2.11.3. These changes have been backported from the 2.13/master branch which we are currently developing on. They now have tests there, but to keep the changes in the 2.11 branch to a minimum, the tests have not been backported. We, the upstream maintainers, are well aware of the Debian policy concerning backwards compatibility and only allowing bugfixes in Debian stable. These releases were specifically made to support Debian stable. We want to help the Debian maintainers this way who would otherwise have to follow and backport the changes we are doing in 2.13. Jochen -- Jochen Topf joc...@remote.org https://www.jochentopf.com/ +49-351-31778688
Bug#873332: stretch-pu: package pyosmium/2.11.3-1
On 09/09/2017 03:42 PM, Julien Cristau wrote: > On Sat, Aug 26, 2017 at 17:43:26 +0200, Bas Couwenberg wrote: > >> Upstream has released a new stable release of pyosmium fixing important >> bugs which I'd like to propose for inclusion in the next stable update. >> >> Kind Regards, >> >> Bas > >> diff -Nru pyosmium-2.11.1/debian/changelog pyosmium-2.11.3/debian/changelog >> --- pyosmium-2.11.1/debian/changelog 2017-05-05 09:51:21.0 +0200 >> +++ pyosmium-2.11.3/debian/changelog 2017-08-26 15:10:04.0 +0200 >> @@ -1,3 +1,11 @@ >> +pyosmium (2.11.3-1) stretch; urgency=medium >> + >> + * New upstream bugfix release. >> +- handler functions not called when using replication service (#38) >> +- handler functions not called when using Reader instead of file >> + >> + -- Bas CouwenbergSat, 26 Aug 2017 15:10:04 +0200 >> + >> pyosmium (2.11.1-1) unstable; urgency=medium >> >>* New upstream bugfix release. > > Can you elaborate on the user or reverse-dependency impact of those > bugs, and what are the risks and mitigations for the changes you're > proposing? Are there any related automated or manual tests? pyosmium doesn't have reverse dependencies (yet), it does have some users. For these issues there are no tests. I've added one of the upstream authors to the CC, who can hopefully elaborate further. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
Bug#873332: stretch-pu: package pyosmium/2.11.3-1
Control: tag -1 moreinfo On Sat, Aug 26, 2017 at 17:43:26 +0200, Bas Couwenberg wrote: > Upstream has released a new stable release of pyosmium fixing important > bugs which I'd like to propose for inclusion in the next stable update. > > Kind Regards, > > Bas > diff -Nru pyosmium-2.11.1/debian/changelog pyosmium-2.11.3/debian/changelog > --- pyosmium-2.11.1/debian/changelog 2017-05-05 09:51:21.0 +0200 > +++ pyosmium-2.11.3/debian/changelog 2017-08-26 15:10:04.0 +0200 > @@ -1,3 +1,11 @@ > +pyosmium (2.11.3-1) stretch; urgency=medium > + > + * New upstream bugfix release. > +- handler functions not called when using replication service (#38) > +- handler functions not called when using Reader instead of file > + > + -- Bas CouwenbergSat, 26 Aug 2017 15:10:04 +0200 > + > pyosmium (2.11.1-1) unstable; urgency=medium > >* New upstream bugfix release. Can you elaborate on the user or reverse-dependency impact of those bugs, and what are the risks and mitigations for the changes you're proposing? Are there any related automated or manual tests? Cheers, Julien
Bug#873332: stretch-pu: package pyosmium/2.11.3-1
Package: release.debian.org Severity: normal Tags: stretch User: release.debian@packages.debian.org Usertags: pu Upstream has released a new stable release of pyosmium fixing important bugs which I'd like to propose for inclusion in the next stable update. Kind Regards, Bas diff -Nru pyosmium-2.11.1/CHANGELOG.md pyosmium-2.11.3/CHANGELOG.md --- pyosmium-2.11.1/CHANGELOG.md2017-05-04 23:36:03.0 +0200 +++ pyosmium-2.11.3/CHANGELOG.md2017-08-20 11:18:52.0 +0200 @@ -12,6 +12,27 @@ ### Fixed +## [2.11.3] - 2017-08-20 + +### Added + +### Changed + +- updated to latest libosmium 2.11 bugfix release + +### Fixed + +- handler functions not called when using Reader instead of file + +## [2.11.2] - 2017-05-25 + +### Added + +### Changed + +### Fixed + +- handler functions not called when using replication service (#38) ## [2.11.1] - 2017-05-04 diff -Nru pyosmium-2.11.1/debian/changelog pyosmium-2.11.3/debian/changelog --- pyosmium-2.11.1/debian/changelog2017-05-05 09:51:21.0 +0200 +++ pyosmium-2.11.3/debian/changelog2017-08-26 15:10:04.0 +0200 @@ -1,3 +1,11 @@ +pyosmium (2.11.3-1) stretch; urgency=medium + + * New upstream bugfix release. +- handler functions not called when using replication service (#38) +- handler functions not called when using Reader instead of file + + -- Bas CouwenbergSat, 26 Aug 2017 15:10:04 +0200 + pyosmium (2.11.1-1) unstable; urgency=medium * New upstream bugfix release. diff -Nru pyosmium-2.11.1/lib/generic_handler.hpp pyosmium-2.11.3/lib/generic_handler.hpp --- pyosmium-2.11.1/lib/generic_handler.hpp 2017-05-04 23:36:03.0 +0200 +++ pyosmium-2.11.3/lib/generic_handler.hpp 2017-08-20 11:18:52.0 +0200 @@ -25,6 +25,7 @@ }; public: +virtual void apply_start() {}; // handler functions virtual void node(const osmium::Node&) const = 0; virtual void way(const osmium::Way&) const = 0; @@ -163,14 +164,7 @@ apply_object(osmium::io::File(cbuf, len, cfmt), locations, idx); } -private: -void apply_object(osmium::io::File file, bool locations, const std::string ) -{ -osmium::osm_entity_bits::type entities = osmium::osm_entity_bits::nothing; -BaseHandler::pre_handler handler = locations? -BaseHandler::location_handler -:BaseHandler::no_handler; - +void apply_start() override { m_callbacks = osmium::osm_entity_bits::nothing; if (hasfunc("node")) m_callbacks |= osmium::osm_entity_bits::node; @@ -182,6 +176,18 @@ m_callbacks |= osmium::osm_entity_bits::area; if (hasfunc("changeset")) m_callbacks |= osmium::osm_entity_bits::changeset; +} + + +private: +void apply_object(osmium::io::File file, bool locations, const std::string ) +{ +osmium::osm_entity_bits::type entities = osmium::osm_entity_bits::nothing; +BaseHandler::pre_handler handler = locations? +BaseHandler::location_handler +:BaseHandler::no_handler; + +apply_start(); if (m_callbacks & osmium::osm_entity_bits::area) { @@ -202,6 +208,7 @@ apply(file, entities, handler, idx); } + bool hasfunc(char const *name) { reference_existing_object::apply ::type converter; PyObject* obj = converter( this ); diff -Nru pyosmium-2.11.1/lib/merged_input.hpp pyosmium-2.11.3/lib/merged_input.hpp --- pyosmium-2.11.1/lib/merged_input.hpp2017-05-04 23:36:03.0 +0200 +++ pyosmium-2.11.3/lib/merged_input.hpp2017-08-20 11:18:52.0 +0200 @@ -16,6 +16,7 @@ class MergeInputReader { public: void apply(BaseHandler& handler, bool simplify = true) { +handler.apply_start(); if (simplify) { objects.sort(osmium::object_order_type_id_reverse_version()); osmium::item_type prev_type = osmium::item_type::undefined; diff -Nru pyosmium-2.11.1/lib/osmium.cc pyosmium-2.11.3/lib/osmium.cc --- pyosmium-2.11.1/lib/osmium.cc 2017-05-04 23:36:03.0 +0200 +++ pyosmium-2.11.3/lib/osmium.cc 2017-08-20 11:18:52.0 +0200 @@ -13,11 +13,17 @@ osmium::apply(rd, h); } +template <> +void apply_reader_simple(osmium::io::Reader , BaseHandler ) { +h.apply_start(); +osmium::apply(rd, h); +} template void apply_reader_simple_with_location(osmium::io::Reader , osmium::handler::NodeLocationsForWays , BaseHandler ) { +h.apply_start(); osmium::apply(rd, l, h); } diff -Nru pyosmium-2.11.1/osmium/version.py pyosmium-2.11.3/osmium/version.py --- pyosmium-2.11.1/osmium/version.py 2017-05-04 23:36:03.0 +0200 +++ pyosmium-2.11.3/osmium/version.py 2017-08-20