[Git][debian-gis-team/python-mapnik][upstream] 2 commits: New upstream version 0.0~20190830-4be2ecd77

Bas Couwenberg gitlab at salsa.debian.org
Thu Jun 4 05:41:16 BST 2020



Bas Couwenberg pushed to branch upstream at Debian GIS Project / python-mapnik


Commits:
b26d9b60 by Bas Couwenberg at 2020-02-21T09:06:08+01:00
New upstream version 0.0~20190830-4be2ecd77
- - - - -
b6e59ffa by Bas Couwenberg at 2020-02-24T19:05:32+01:00
New upstream version 0.0~20200224-7da019cf9
- - - - -


5 changed files:

- setup.py
- − src/mapnik_svg_generator_grammar.cpp
- test/python_tests/filter_test.py
- test/python_tests/json_feature_properties_test.py
- test/python_tests/mapnik_test_data_test.py


Changes:

=====================================
setup.py
=====================================
@@ -253,7 +253,7 @@ if os.environ.get("CXX", False) == False:
 
 setup(
     name="mapnik",
-    version="0.1",
+    version="3.0.23",
     packages=['mapnik','mapnik.printing'],
     author="Blake Thompson",
     author_email="flippmoke at gmail.com",
@@ -303,7 +303,6 @@ setup(
             'src/mapnik_rule.cpp',
             'src/mapnik_scaling_method.cpp',
             'src/mapnik_style.cpp',
-            'src/mapnik_svg_generator_grammar.cpp',
             'src/mapnik_symbolizer.cpp',
             'src/mapnik_view_transform.cpp',
             'src/python_grid_utils.cpp',


=====================================
src/mapnik_svg_generator_grammar.cpp deleted
=====================================
@@ -1,27 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko, Jean-Francois Doyon
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/svg/geometry_svg_generator_impl.hpp>
-#include <string>
-
-using sink_type = std::back_insert_iterator<std::string>;
-template struct mapnik::svg::svg_path_generator<sink_type, mapnik::vertex_adapter>;


=====================================
test/python_tests/filter_test.py
=====================================
@@ -174,13 +174,13 @@ def test_regex_replace():
     context.push('name')
     f = mapnik.Feature(context, 0)
     f["name"] = 'test'
-    expr = mapnik.Expression("[name].replace('(\B)|( )','$1 ')")
+    expr = mapnik.Expression("[name].replace('(\\B)|( )','$1 ')")
     eq_(expr.evaluate(f), 't e s t')
 
 
 def test_unicode_regex_replace_to_str():
-    expr = mapnik.Expression("[name].replace('(\B)|( )','$1 ')")
-    eq_(str(expr), "[name].replace('(\B)|( )','$1 ')")
+    expr = mapnik.Expression("[name].replace('(\\B)|( )','$1 ')")
+    eq_(str(expr), "[name].replace('(\\B)|( )','$1 ')")
 
 
 def test_unicode_regex_replace():
@@ -188,7 +188,7 @@ def test_unicode_regex_replace():
     context.push('name')
     f = mapnik.Feature(context, 0)
     f["name"] = 'Québec'
-    expr = mapnik.Expression("[name].replace('(\B)|( )','$1 ')")
+    expr = mapnik.Expression("[name].replace('(\\B)|( )','$1 ')")
     # will fail if -DBOOST_REGEX_HAS_ICU is not defined
     eq_(expr.evaluate(f), u'Q u é b e c')
 


=====================================
test/python_tests/json_feature_properties_test.py
=====================================
@@ -35,7 +35,7 @@ chars = [
     {
         "name": "reverse_solidus",  # backslash
         "test": "string with \\ quote",
-        "json": '{"type":"Feature","id":1,"geometry":null,"properties":{"name":"string with \\\ quote"}}'
+        "json": '{"type":"Feature","id":1,"geometry":null,"properties":{"name":"string with \\\\ quote"}}'
     },
     {
         "name": "solidus",  # forward slash


=====================================
test/python_tests/mapnik_test_data_test.py
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
@@ -55,7 +55,7 @@ def test_opening_data():
                 else:
                     for plugin in plugin_mapping[ext]:
                         kwargs = {'type': plugin, 'file': filepath}
-                        if plugin is 'ogr':
+                        if plugin == 'ogr':
                             kwargs['layer_by_index'] = 0
                         try:
                             mapnik.Datasource(**kwargs)



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-mapnik/-/compare/32ed4213017b1564ad3464a3ab7b2f3277e36d4a...b6e59ffaf9a710f69f5eee274f7b16a4be895fe8

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-mapnik/-/compare/32ed4213017b1564ad3464a3ab7b2f3277e36d4a...b6e59ffaf9a710f69f5eee274f7b16a4be895fe8
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/20200604/d6cea3ca/attachment-0001.html>


More information about the Pkg-grass-devel mailing list