Add PyPDF2 as a dependency and check for pycairo before testing

Author: mbonnefoy

.travis.yml

@@ -76,6 +76,7 @@ before_install:
  - pip install --upgrade --user wheel
  - pip install --upgrade --user twine
  - pip install --upgrade --user setuptools
+ - pip install --upgrade --user PyPDF2
  - python --version
 
 install:

test/python_tests/pdf_printing_test.py

@@ -4,7 +4,7 @@
 
 from nose.tools import eq_
 
-from mapnik import printing, Map, load_map
+import mapnik
 from .utilities import execution_path, run_all
 
 def setup():
@@ -13,15 +13,15 @@ def setup():
     os.chdir(execution_path('.'))
 
 def make_map_from_xml(source_xml):
-	m = Map(100, 100)
-	load_map(m, source_xml, True)
+	m = mapnik.Map(100, 100)
+	mapnik.load_map(m, source_xml, True)
 	m.zoom_all()
 
 	return m
 
 def make_pdf(m, output_pdf, esri_wkt):
 	# renders a PDF with a grid and a legend
-	page = printing.PDFPrinter(use_ocg_layers=True)
+	page = mapnik.printing.PDFPrinter(use_ocg_layers=True)
 
 	page.render_map(m, output_pdf)
 	page.render_grid_on_map(m)
@@ -30,19 +30,20 @@ def make_pdf(m, output_pdf, esri_wkt):
 	page.finish()
 	page.add_geospatial_pdf_header(m, output_pdf, wkt=esri_wkt)
 
-def test_pdf_printing():
-	source_xml = '../data/good_maps/marker-text-line.xml'.encode('utf-8')
-	m = make_map_from_xml(source_xml)
+if mapnik.has_pycairo():
+	def test_pdf_printing():
+		source_xml = '../data/good_maps/marker-text-line.xml'.encode('utf-8')
+		m = make_map_from_xml(source_xml)
 
-	actual_pdf = "/tmp/pdf-printing-actual.pdf"
-	esri_wkt = 'GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]'
-	make_pdf(m, actual_pdf, esri_wkt)
+		actual_pdf = "/tmp/pdf-printing-actual.pdf"
+		esri_wkt = 'GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]'
+		make_pdf(m, actual_pdf, esri_wkt)
 
-	expected_pdf = 'images/pycairo/pdf-printing-expected.pdf'
+		expected_pdf = 'images/pycairo/pdf-printing-expected.pdf'
 
-	diff = abs(os.stat(expected_pdf).st_size - os.stat(actual_pdf).st_size)
-	msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff, actual_pdf, 'tests/python_tests/' + expected_pdf)
-	eq_(diff < 1500, True, msg)
+		diff = abs(os.stat(expected_pdf).st_size - os.stat(actual_pdf).st_size)
+		msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff, actual_pdf, 'tests/python_tests/' + expected_pdf)
+		eq_(diff < 1500, True, msg)
 
 # TODO: ideas for further testing on printing module
 # - test with and without pangocairo