File tree Expand file tree Collapse file tree 3 files changed +16
-5
lines changed Expand file tree Collapse file tree 3 files changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -18,3 +18,4 @@ mapnik/paths.py
18
18
.mason /
19
19
mason_packages /
20
20
mapnik /plugins
21
+ .coverage
Original file line number Diff line number Diff line change @@ -42,16 +42,22 @@ before_install:
42
42
- PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user nose
43
43
- PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user wheel
44
44
- PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user twine
45
+ # prevent from compiling libyaml (which fails with clang) when installing PyYAML as python-coveralls dependency
46
+ - PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user --global-option="--without-libyaml" PyYAML
47
+ - PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user --no-compile python-coveralls
45
48
- python --version
46
49
47
50
install :
48
51
- python setup.py install --prefix $(pwd)/mason_packages/.link
49
52
50
- before_script :
51
- - python test/run_tests.py -q
52
-
53
53
script :
54
54
- python test/visual.py -q
55
+ - python setup.py nosetests --with-coverage --cover-package=mapnik
56
+
57
+ after_script :
58
+ - coveralls
59
+
60
+ after_success :
55
61
- if [[ ${COMMIT_MESSAGE} =~ "[publish]" ]]; then
56
62
python setup.py bdist_wheel;
57
63
if [[ $(uname -s) == 'Linux' ]]; then
Original file line number Diff line number Diff line change @@ -113,8 +113,12 @@ def run(self):
113
113
linkflags = check_output ([mapnik_config , '--libs' ]).split (' ' )
114
114
lib_path = linkflags [0 ][2 :]
115
115
linkflags .extend (check_output ([mapnik_config , '--ldflags' ]).split (' ' ))
116
- except :
117
- raise Exception ("Failed to find proper linking flags from mapnik config" )
116
+ except OSError :
117
+ msg = "Missing mapnik-config binary, expected at %s" % mapnik_config
118
+ raise Exception (msg )
119
+ except Exception as e :
120
+ msg = "Failed to find proper linking flags from mapnik config: %s" % str (e )
121
+ raise Exception (msg )
118
122
119
123
# Dynamically make the mapnik/paths.py file if it doesn't exist.
120
124
if os .path .isfile ('mapnik/paths.py' ):
You can’t perform that action at this time.
0 commit comments