From df35b094f5c4f2a3b5a6ebb3876fa2e252af64a3 Mon Sep 17 00:00:00 2001
From: "Egli Adrian (IT-SCI-API-PFI)" <adrian.egli@sbb.ch>
Date: Mon, 17 Jun 2019 14:57:46 +0200
Subject: [PATCH] pycairo version changed for windows
---
examples/demo.py | 8 +++++++-
setup.py | 12 ++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/examples/demo.py b/examples/demo.py
index fb7196bd..1e4a14d3 100644
--- a/examples/demo.py
+++ b/examples/demo.py
@@ -163,8 +163,14 @@ class Demo:
def run_complex_scene():
demo_001 = Demo(Scenario_Generator.load_scenario('complex_scene.pkl'))
demo_001.set_record_frames(os.path.join(__file_dirname__, '..', 'rendering', 'frame_{:04d}.bmp'))
- demo_001.run_demo(360)
+ demo_001.run_demo(120)
+ @staticmethod
+ def run_complex_scene_2():
+ demo_001 = Demo(Scenario_Generator.load_scenario('complex_scene_2.pkl'))
+ demo_001.set_record_frames(os.path.join(__file_dirname__, '..', 'rendering', 'frame_{:04d}.bmp'))
+ demo_001.run_demo(120)
if __name__ == "__main__":
Demo.run_complex_scene()
+ Demo.run_complex_scene_2()
diff --git a/setup.py b/setup.py
index 72e19e3c..c11b99ff 100644
--- a/setup.py
+++ b/setup.py
@@ -20,21 +20,21 @@ if os.name == 'nt':
is64bit = p[0] == '64bit'
if sys.version[0:3] == '3.5':
if is64bit:
- url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.0-cp35-cp35m-win_amd64.whl'
+ url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.1-cp35-cp35m-win_amd64.whl'
else:
- url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.0-cp35-cp35m-win32.whl'
+ url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.1-cp35-cp35m-win32.whl'
if sys.version[0:3] == '3.6':
if is64bit:
- url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.0-cp36-cp36m-win_amd64.whl'
+ url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.1-cp36-cp36m-win_amd64.whl'
else:
- url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.0-cp36-cp36m-win32.whl'
+ url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.1-cp36-cp36m-win32.whl'
if sys.version[0:3] == '3.7':
if is64bit:
- url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.0-cp37-cp37m-win_amd64.whl'
+ url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.1-cp37-cp37m-win_amd64.whl'
else:
- url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.0-cp37-cp37m-win32.whl'
+ url = 'https://download.lfd.uci.edu/pythonlibs/t4jqbe6o/pycairo-1.18.1-cp37-cp37m-win32.whl'
try:
import pycairo
--
GitLab