Skip to content

Commit f505106

Browse files
committed
Merge branch 'master' of github.com:mapnik/python-mapnik
2 parents e13a62f + cbb221c commit f505106

387 files changed

Lines changed: 383 additions & 11 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitmodules

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
[submodule "tests/data"]
2-
path = tests/data
3-
url = git@github.com:mapnik/test-data.git
1+
[submodule "test/data-visual"]
2+
path = test/data-visual
3+
url = https://github.com/mapnik/test-data-visual.git
4+
[submodule "test/data"]
5+
path = test/data
6+
url = https://github.com/mapnik/test-data.git

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: cpp
22

33
git:
4-
submodules: false
5-
depth: 2
4+
submodules: true
5+
depth: 10
66

77
sudo: false
88

@@ -24,7 +24,7 @@ install:
2424
- time python setup.py build
2525

2626
before_script:
27-
- true
27+
- python test/run_tests.py -q
2828

2929
script:
30-
- python setup.py test
30+
- python test/visual.py -q

README.md

Lines changed: 2 additions & 2 deletions

test/data

Submodule data added at f95e078

test/data-visual

Submodule data-visual added at 93e48bd

tests/python_tests/agg_rasterizer_integer_overflow_test.py renamed to test/python_tests/agg_rasterizer_integer_overflow_test.py

File renamed without changes.

0 commit comments

Comments
 (0)