This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-mapnik.
commit 76d79ec96042a6989868b1a02d7d02388d72c551 Author: Bas Couwenberg <[email protected]> Date: Fri Aug 12 19:56:55 2016 +0200 Imported Upstream version 0.0~20160810-3a60211 --- .travis.yml | 17 +++++++++-------- src/mapnik_datasource.cpp | 6 ++---- src/mapnik_feature.cpp | 4 ++-- src/mapnik_featureset.cpp | 4 ++-- src/mapnik_geometry.cpp | 4 +--- src/mapnik_image.cpp | 3 +-- src/mapnik_python.cpp | 7 +++++++ 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 413d70b..da486f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,14 +92,15 @@ before_script: script: - python test/visual.py -q - - if [[ ${COMMIT_MESSAGE} =~ "[publish]" ]]; then - python setup.py bdist_wheel; - if [[ $(uname -s) == 'Linux' ]]; then - export PRE_DISTS='dist/*.whl'; - rename 's/linux_x86_64/any/;' $PRE_DISTS; - fi - export DISTS='dist/*'; - $(pwd)/mason_packages/.link/bin/twine upload -u $PYPI_USER -p $PYPI_PASSWORD $DISTS ; + - | + if [[ ${COMMIT_MESSAGE} =~ "[publish]" ]]; then + python setup.py bdist_wheel + if [[ $(uname -s) == 'Linux' ]]; then + export PRE_DISTS='dist/*.whl' + rename 's/linux_x86_64/any/;' $PRE_DISTS + fi + export DISTS='dist/*' + $(pwd)/mason_packages/.link/bin/twine upload -u $PYPI_USER -p $PYPI_PASSWORD $DISTS fi diff --git a/src/mapnik_datasource.cpp b/src/mapnik_datasource.cpp index e888deb..c0b2749 100644 --- a/src/mapnik_datasource.cpp +++ b/src/mapnik_datasource.cpp @@ -180,8 +180,8 @@ void export_datasource() .value("Collection",mapnik::datasource_geometry_t::Collection) ; - class_<datasource, - boost::noncopyable>("Datasource",no_init) + class_<datasource,std::shared_ptr<datasource>, + boost::noncopyable>("Datasource",no_init) .def("type",&datasource::type) .def("geometry_type",&datasource::get_geometry_type) .def("describe",&describe) @@ -196,8 +196,6 @@ void export_datasource() .def(self == self) ; - register_ptr_to_python<std::shared_ptr<datasource> >(); - def("CreateDatasource",&create_datasource); class_<memory_datasource, diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp index cd0a15b..e8f1fbc 100644 --- a/src/mapnik_feature.cpp +++ b/src/mapnik_feature.cpp @@ -211,7 +211,8 @@ void export_feature() .def("push", &context_type::push) ; - class_<mapnik::feature_impl, boost::noncopyable>("Feature",init<context_ptr,mapnik::value_integer>("Default ctor.")) + class_<mapnik::feature_impl,std::shared_ptr<mapnik::feature_impl>, + boost::noncopyable>("Feature",init<context_ptr,mapnik::value_integer>("Default ctor.")) .def("id",&mapnik::feature_impl::id) .add_property("geometry", make_function(&mapnik::feature_impl::get_geometry,return_value_policy<reference_existing_object>()), @@ -229,5 +230,4 @@ void export_feature() .def("from_geojson",from_geojson_impl) .staticmethod("from_geojson") ; - register_ptr_to_python<std::shared_ptr<mapnik::feature_impl> >(); } diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp index b4ab247..521beab 100644 --- a/src/mapnik_featureset.cpp +++ b/src/mapnik_featureset.cpp @@ -56,11 +56,11 @@ void export_featureset() { using namespace boost::python; // Featureset implements Python iterator interface - class_<mapnik::Featureset, boost::noncopyable>("Featureset", no_init) + class_<mapnik::Featureset, std::shared_ptr<mapnik::Featureset>, + boost::noncopyable>("Featureset", no_init) .def("__iter__", pass_through) .def("__next__", next) // Python2 support .def("next", next) ; - register_ptr_to_python<std::shared_ptr<mapnik::Featureset> >(); } diff --git a/src/mapnik_geometry.cpp b/src/mapnik_geometry.cpp index 18f7dae..1181c06 100644 --- a/src/mapnik_geometry.cpp +++ b/src/mapnik_geometry.cpp @@ -259,7 +259,7 @@ void export_geometry() .def("to_wkt",&to_wkt_impl) ; - class_<geometry<double>, boost::noncopyable>("Geometry",no_init) + class_<geometry<double>, std::shared_ptr<geometry<double> >, boost::noncopyable>("Geometry",no_init) .def("envelope",&geometry_envelope_impl) .def("from_geojson", from_geojson_impl) .def("from_wkt", from_wkt_impl) @@ -282,6 +282,4 @@ void export_geometry() //.def("to_svg",&to_svg) // TODO add other geometry_type methods ; - - register_ptr_to_python<std::shared_ptr<geometry<double>> >(); } diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp index 4b10384..80aebcb 100644 --- a/src/mapnik_image.cpp +++ b/src/mapnik_image.cpp @@ -389,7 +389,7 @@ void export_image() .value("gray64f", mapnik::image_dtype_gray64f) ; - class_<image_any, boost::noncopyable >("Image","This class represents a image.",init<int,int>()) + class_<image_any,std::shared_ptr<image_any>, boost::noncopyable >("Image","This class represents a image.",init<int,int>()) .def(init<int,int,mapnik::image_dtype>()) .def(init<int,int,mapnik::image_dtype,bool>()) .def(init<int,int,mapnik::image_dtype,bool,bool>()) @@ -467,6 +467,5 @@ void export_image() .staticmethod("from_cairo") #endif ; - register_ptr_to_python<std::shared_ptr<image_any> >(); } diff --git a/src/mapnik_python.cpp b/src/mapnik_python.cpp index 4c09213..7f8534c 100644 --- a/src/mapnik_python.cpp +++ b/src/mapnik_python.cpp @@ -1068,6 +1068,13 @@ BOOST_PYTHON_MODULE(_mapnik) python_optional<mapnik::text_transform_e>(); register_ptr_to_python<mapnik::expression_ptr>(); register_ptr_to_python<mapnik::path_expression_ptr>(); +#if BOOST_VERSION == 106000 // ref #104 + register_ptr_to_python<std::shared_ptr<mapnik::geometry::geometry<double> > >(); + register_ptr_to_python<std::shared_ptr<mapnik::datasource> >(); + register_ptr_to_python<std::shared_ptr<mapnik::feature_impl> >(); + register_ptr_to_python<std::shared_ptr<mapnik::Featureset> >(); + register_ptr_to_python<std::shared_ptr<mapnik::image_any> >(); +#endif to_python_converter<mapnik::value_holder,mapnik_param_to_python>(); to_python_converter<mapnik::value,mapnik_value_to_python>(); to_python_converter<mapnik::enumeration_wrapper,mapnik_enumeration_wrapper_to_python>(); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
