From 8ceb99f549f41dfd859261b9b8b4a6bea3bce0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar?= Date: Fri, 22 Jan 2021 13:49:12 +0100 Subject: [PATCH 1/3] Replace 'cairocffi' by 'pycairo' --- examples/roses.py | 5 ++++- gizeh/gizeh.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/roses.py b/examples/roses.py index 9e498ad..8012eba 100644 --- a/examples/roses.py +++ b/examples/roses.py @@ -7,7 +7,10 @@ import gizeh as gz import numpy as np -from fractions import gcd +try: + from fractions import gcd +except ImportError: + from math import gcd def rose(d, n): """ Returns a polyline representing a rose of radius 1 """ diff --git a/gizeh/gizeh.py b/gizeh/gizeh.py index f591ca5..c992c97 100644 --- a/gizeh/gizeh.py +++ b/gizeh/gizeh.py @@ -1,7 +1,7 @@ from copy import copy, deepcopy from base64 import b64encode import numpy as np -import cairocffi as cairo +import cairo from .geometry import (rotation_matrix, translation_matrix, scaling_matrix, diff --git a/setup.py b/setup.py index c5e0c85..0236f33 100644 --- a/setup.py +++ b/setup.py @@ -20,5 +20,5 @@ long_description=open('README.rst').read(), license='see LICENSE.txt', keywords="Cairo vector graphics", - install_requires=['cairocffi', 'numpy'], + install_requires=['pycairo>=1.20.0', 'numpy'], packages= find_packages(exclude='docs')) From c46b4ceaecb8404b590d146a68239b90d8a658ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar?= Date: Fri, 22 Jan 2021 14:04:07 +0100 Subject: [PATCH 2/3] Unfreeze pycairo version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0236f33..8800d05 100644 --- a/setup.py +++ b/setup.py @@ -20,5 +20,5 @@ long_description=open('README.rst').read(), license='see LICENSE.txt', keywords="Cairo vector graphics", - install_requires=['pycairo>=1.20.0', 'numpy'], + install_requires=['pycairo', 'numpy'], packages= find_packages(exclude='docs')) From dc8e909ade3c41c54ec5934cf4b4e91979d14941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar?= Date: Fri, 22 Jan 2021 18:01:03 +0100 Subject: [PATCH 3/3] Update Travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b14cf02..5d9911c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "3.6" # command to install dependencies before_install: - - sudo apt-get install libcairo2-dev python-dev libffi-dev + - sudo apt-get install libcairo2-dev pkg-config python3-dev - pip install pytest coveralls pytest-cov pillow - pip install -e . # command to run tests