Commit graph

12403 commits

Author SHA1 Message Date
Artem Pavlenko
7da9009e7f
Merge pull request #4294 from jbicha/py310
mapnik 3.1 Scons needs updating for Python 3.10
2022-02-08 14:24:42 +00:00
Mats Wichmann
ed912a0eae Stop using custom OrderedDict
OrdredDict is in the standard library for all supported Python versions
(2.7 and 3.5+) and has improvements over the ActiveState recipe version
of OrderedDict we have been using. Switch to importing from collections
instead of getting it from SCons.Util (tests already did this).

At the same time, reorganize the Util.py imports - import Iterable
from collections.abc if possible (it is deprecated to import
it from collections, will stop working in 3.8); try getting the
User{Dict,List,String} from collections if possible - that is, try the
3.x way first.

Signed-off-by: Mats Wichmann <mats@linux.com>

https://github.com/SCons/scons/commit/3fa7141ec7b39
2022-02-07 12:32:15 -05:00
Artem Pavlenko
8b70a205c8 update CHANGELOG for mapnik v3.1.0 release [skip ci] 2021-01-08 11:20:06 +00:00
Artem Pavlenko
445438e34c setting up for mapnik v3.1.0 release [skip ci] 2021-01-08 11:12:07 +00:00
Artem Pavlenko
cd7272c4ef Update min BOOST_VERSION requirement to 1.61 2021-01-07 14:51:47 +00:00
Artem Pavlenko
49e0ef182f Require c++14 support in order to support building agaings Boost.Geometry >= 1.75
(https://github.com/boostorg/geometry/issues/590)
2021-01-07 14:39:10 +00:00
Artem Pavlenko
7754b6f70b update CHANGELOG for mapnik v3.0.24 release [skip ci] 2021-01-05 12:32:19 +00:00
Artem Pavlenko
be0904fcd1 setting up for mapnik v3.0.24 release [skip ci] 2021-01-05 12:31:01 +00:00
Artem Pavlenko
268fb53511 Update version to v3.0.24 (rc1) 2021-01-05 12:24:44 +00:00
Artem Pavlenko
80bc8ef819 Update CHANGELOG 2021-01-05 12:23:05 +00:00
Artem Pavlenko
4d9669bf42 update copyright (C) 2021 2021-01-05 11:59:41 +00:00
Artem Pavlenko
2d0582187a Fix most compiler warnings 2021-01-05 11:54:55 +00:00
Artem Pavlenko
255e2977a7 travis-ci - remove gcc build 2020-12-16 10:51:32 +00:00
Artem Pavlenko
6f0bab6246 Backport support for boost 1.74 via patch from @redneb 2020-12-15 16:23:59 +00:00
Artem Pavlenko
473e6f51b0 Update bootstrap.sh 2020-12-15 16:23:31 +00:00
Artem Pavlenko
23b8ecc997
Merge pull request #4171 from msitu/decode_darwin_value
fix pg_config error for darwin os
2020-09-04 14:16:05 +01:00
msitu@ceresimaging.net
a103f5e66a fix pg_config error for darwin os 2020-08-27 12:50:45 -07:00
Raul Marin
bc01c22c33 Use pkg-config to find FreeType2 if available (ref #4164) 2020-08-06 09:53:37 +01:00
Artem Pavlenko
d8346dd963 update CHANGELOG for mapnik v3.0.23 release [skip ci] 2020-02-18 09:18:42 +00:00
Artem Pavlenko
bdb30f47a5 setting up for mapnik v3.0.23 release [skip ci] 2020-02-18 09:16:39 +00:00
Artem Pavlenko
b94f00f7c5
Remove appveyor ci badge 2020-02-13 15:17:19 +00:00
Artem Pavlenko
489baf8423
Merge pull request #4126 from cpaulik/v3.0.x-gdal-int32-support
v3.0.x - Add Int32 support for gdal driver
2020-02-13 15:12:55 +00:00
Christoph Paulik
efc65126db Add Int32 support for gdal driver 2020-02-12 12:28:06 +01:00
Artem Pavlenko
f1cf712d50 Add support for BOOST >= 1_72 (backport relevant changes from master) 2020-01-23 14:48:43 +00:00
Mickey Rose
78756a9056 better tests for logical expressions
Two of the original checks were not testing what they were supposed to
test, because the result of eval didn't depend on correct parsing:

    eval("not true or not true")
    correct parse:      ((not true) or (not true)) == false
    incorrect parse:    (not (true or (not true))) == false

    eval("not false and not false")
    correct parse:      ((not false) and (not false)) == true
    incorrect parse:    (not (false and (not false))) == true

(cherry picked from commit d38d16ade9)
2020-01-02 19:32:12 +01:00
Mickey Rose
4b0bdd8630 2to3 last remnants of Python 2 syntax 2019-12-31 12:25:21 +01:00
Mickey Rose
745e393fd6 scons: minor cleanup 2019-09-01 11:54:23 +02:00
Mickey Rose
0d68464194 scons: define OPTIONAL_LIBSHEADERS before use
Fixes #4075
2019-09-01 10:25:46 +02:00
Mickey Rose
d5856a2e9d travis: move variables not relevant to cache contents out of env
(so that changing these later doesn't invalidate the cache)

(cherry picked from commit 2929c4ae6d)
2019-08-14 15:53:51 +02:00
Mickey Rose
fc7e2e1e3a travis: remove downstream trigger (refs #3366)
(cherry picked from commit a6057af11f)
2019-08-14 15:53:10 +02:00
Mickey Rose
fe96110e1d travis: install clang from apt
(cherry picked from commit f432f5f1cc)
2019-08-14 15:50:43 +02:00
Mickey Rose
19ad1f1156 travis: shortcut
(cherry picked from commit 5d51bdde7a)
2019-08-14 15:33:31 +02:00
Mickey Rose
d09fdd78a9 travis: silence gcov output and errors flooding build log
Also added ignore paths from `codecov.yml` to the command, because
codecov-bash doesn't pull those from there. Currently its `parse_yaml`
function simply ignores arrays, so they don't even check for "ignore".
4678d212cc/codecov (L834)
2019-08-14 13:36:44 +02:00
Artem Pavlenko
2ab8602f71 update CHANGELOG for mapnik v3.0.22 release [skip ci] 2019-01-22 10:58:22 +00:00
Artem Pavlenko
c338cacd71 setting up for mapnik v3.0.22 release [skip ci] 2019-01-22 10:56:47 +00:00
Tomek Dubrownik
a1543b359f Compatibility patch for Boost GIL v1.68
A number of basic typedef were removed in the Boost GIL 1.68 release,
notably `bits32` and `bits32f`. Additionally the
`GIL_DEFINE_ALL_TYPEDEFS` macro signature changed.

This commit introduces compatibility type aliases and conditionally
calls the new macro if `BOOST_VERSION` is high enough.
2019-01-22 10:50:23 +00:00
Artem Pavlenko
4698d43234 fix Boost.GIL includes for BOOST_VERSION >= 1.69 (ref #4000) 2019-01-22 10:36:12 +00:00
Artem Pavlenko
24425f9ba5 explicit cast to native enum type in switch statements to address error: case value is not a constant expression
(clang version 8.0.0 (trunk 347189))
2019-01-22 10:33:41 +00:00
Artem Pavlenko
a1e91dcf35
Merge pull request #4017 from mapycz/changelog-3.0.22
Changelog for 3.0.22
2019-01-22 09:15:45 +00:00
Jiri Drbalek
2c396a52ad Changelog for 3.0.22 2019-01-05 16:03:42 +00:00
Artem Pavlenko
bc64766d32
Merge pull request #4012 from mapycz/v3.0.x-cairo-polygon-pattern-vectorial
v3.0.x: Vector patterns with Cairo
2018-11-29 20:02:10 +00:00
Jiri Drbalek
8b7427bf6b Update visual tests 2018-11-29 17:57:35 +00:00
Jiri Drbalek
378b19b53d Vector patterns with Cairo 2018-11-29 17:45:51 +00:00
talaj
38fa2a9792
Merge pull request #4005 from mapycz/v3.0.x-fix-pattern-alignment
v3.0.x: True global pattern alignment, fixed local alignment
2018-11-06 18:05:30 +01:00
Jiri Drbalek
0213b0d8c7 Update visual tests 2018-10-27 20:32:26 +00:00
Jiri Drbalek
e472ad965e True global pattern alignment, fixed local alignment 2018-10-27 20:27:42 +00:00
Jiri Drbalek
73b8369178 render_pattern() needs its own rasterizer 2018-10-27 20:27:42 +00:00
talaj
0a7665a52d
Merge pull request #4004 from mapycz/v3.0.x-line-pattern-repeat
v3.0.x: Line pattern "repeat"
2018-10-27 21:46:55 +02:00
Jiri Drbalek
68cb0c2a03 Update tests 2018-10-23 19:54:26 +00:00
Jiri Drbalek
e49abfc90e Polygon pattern on line geometries for Grid backend 2018-10-23 19:48:34 +00:00