From 42a80af638abbd80b3c05578c02dc9e907d4162a Mon Sep 17 00:00:00 2001 From: Aathish Sivasubrahmanian Date: Tue, 26 May 2020 17:51:21 +0530 Subject: [PATCH 1/3] Fixes #91 --- Scripts/pycairoInstall.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/pycairoInstall.py b/Scripts/pycairoInstall.py index 44e7eed652..4831a60508 100644 --- a/Scripts/pycairoInstall.py +++ b/Scripts/pycairoInstall.py @@ -17,7 +17,7 @@ print("Installing Cairo") os.system("pip install pycairo-1.19.1-cp36-cp36m-win_amd64.whl") os.remove("pycairo-1.19.1-cp36-cp36m-win_amd64.whl") - + #In case the python version is 3.7 and the system is 32-bit, try pycairo‑1.19.1‑cp37‑cp37m‑win32.whl version of cairo elif sys.version[:3]=='3.7' and platform.machine()=='x86': urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp37-cp37m-win32.whl", "pycairo-1.19.1-cp37-cp37m-win32.whl") @@ -33,7 +33,7 @@ print("Installing Cairo") os.system("pip install pycairo-1.19.1-cp37-cp37m-win_amd64.whl") os.remove("pycairo-1.19.1-cp37-cp37m-win_amd64.whl") - + #In case the python version is 3.8 and the system is 32-bit, try pycairo-1.19.1-cp38-cp38-win32.whl version of cairo elif sys.version[:3]=='3.8' and platform.machine()=='x86': urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp38-cp38-win32.whl", "pycairo-1.19.1-cp38-cp38-win32.whl") @@ -41,11 +41,11 @@ print("Installing Cairo") os.system("pip install pycairo-1.19.1-cp38-cp38-win32.whl") os.remove("pycairo-1.19.1-cp38-cp38-win32.whl") - + #In case the python version is 3.8 and the system is AMD64, try pycairo-1.19.1-cp38-cp38-win_amd64.whl version of cairo elif sys.version[:3]=='3.8' and platform.machine()=='AMD64': urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp38-cp38-win_amd64.whl", "pycairo-1.19.1-cp38-cp38-win_amd64.whl") print("Sucessfully downloaded Cairo for your system") print("Installing Cairo") os.system("pip install pycairo-1.19.1-cp38-cp38-win_amd64.whl") - os.remove("pycairo-1.19.1-cp38-cp38-win_amd64.whl") + os.remove("pycairo-1.19.1-cp38-cp38-win_amd64.whl") From 4192e573ebc588b542c36b7e879a697025ff72e3 Mon Sep 17 00:00:00 2001 From: Aathish Sivasubrahmanian Date: Tue, 26 May 2020 18:09:50 +0530 Subject: [PATCH 2/3] Complete removal of pycairoinstall.py This is temporary. It will be added shortly. --- Scripts/pycairoInstall.py | 51 --------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 Scripts/pycairoInstall.py diff --git a/Scripts/pycairoInstall.py b/Scripts/pycairoInstall.py deleted file mode 100644 index 4831a60508..0000000000 --- a/Scripts/pycairoInstall.py +++ /dev/null @@ -1,51 +0,0 @@ -import platform -import os -import sys -import urllib.request - -if 'Windows' in platform.system(): - #In case the python version is 3.6 and the system is 32-bit, try pycairo‑1.19.1‑cp37‑cp37m‑win32.whl version of cairo - if sys.version[:3]=='3.6' and platform.machine()=='x86': - urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp36-cp36m-win32.whl", "pycairo-1.19.1-cp36-cp36m-win32.whl") - os.system("pip install pycairo-1.19.1-cp36-cp36m-win32.whl") - os.remove("pycairo-1.19.1-cp37-cp37m-win32.whl") - - #In case the python version is 3.6 and the system is 64-bit, try pycairo‑1.19.1‑cp37‑cp37m‑win32.whl version of cairo - elif sys.version[:3]=='3.6' and platform.machine()=='AMD64': - urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp36-cp36m-win_amd64.whl", "pycairo-1.19.1-cp36-cp36m-win_amd64.whl") - print("Sucessfully downloaded Cairo for your system") - print("Installing Cairo") - os.system("pip install pycairo-1.19.1-cp36-cp36m-win_amd64.whl") - os.remove("pycairo-1.19.1-cp36-cp36m-win_amd64.whl") - - #In case the python version is 3.7 and the system is 32-bit, try pycairo‑1.19.1‑cp37‑cp37m‑win32.whl version of cairo - elif sys.version[:3]=='3.7' and platform.machine()=='x86': - urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp37-cp37m-win32.whl", "pycairo-1.19.1-cp37-cp37m-win32.whl") - print("Sucessfully downloaded Cairo for your system") - print("Installing Cairo") - os.system("pip install pycairo-1.19.1-cp37-cp37m-win32.whl") - os.remove("pycairo-1.19.1-cp37-cp37m-win32.whl") - - #In case the python version is 3.7 and the system is AMD64, try pycairo-1.19.1-cp37-cp37m-win_amd64.whl version of cairo - elif sys.version[:3]=='3.7' and platform.machine()=='AMD64': - urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp37-cp37m-win_amd64.whl", "pycairo-1.19.1-cp37-cp37m-win_amd64.whl") - print("Sucessfully downloaded Cairo for your system") - print("Installing Cairo") - os.system("pip install pycairo-1.19.1-cp37-cp37m-win_amd64.whl") - os.remove("pycairo-1.19.1-cp37-cp37m-win_amd64.whl") - - #In case the python version is 3.8 and the system is 32-bit, try pycairo-1.19.1-cp38-cp38-win32.whl version of cairo - elif sys.version[:3]=='3.8' and platform.machine()=='x86': - urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp38-cp38-win32.whl", "pycairo-1.19.1-cp38-cp38-win32.whl") - print("Sucessfully downloaded Cairo for your system") - print("Installing Cairo") - os.system("pip install pycairo-1.19.1-cp38-cp38-win32.whl") - os.remove("pycairo-1.19.1-cp38-cp38-win32.whl") - - #In case the python version is 3.8 and the system is AMD64, try pycairo-1.19.1-cp38-cp38-win_amd64.whl version of cairo - elif sys.version[:3]=='3.8' and platform.machine()=='AMD64': - urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp38-cp38-win_amd64.whl", "pycairo-1.19.1-cp38-cp38-win_amd64.whl") - print("Sucessfully downloaded Cairo for your system") - print("Installing Cairo") - os.system("pip install pycairo-1.19.1-cp38-cp38-win_amd64.whl") - os.remove("pycairo-1.19.1-cp38-cp38-win_amd64.whl") From 3aa8dac0eb7ab3e2ab92f6de138d79099d7f1387 Mon Sep 17 00:00:00 2001 From: Aathish Sivasubrahmanian Date: Tue, 26 May 2020 18:11:39 +0530 Subject: [PATCH 3/3] Put pycairoinstall.py in newly named scripts folder. --- scripts/pycairoinstall.py | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 scripts/pycairoinstall.py diff --git a/scripts/pycairoinstall.py b/scripts/pycairoinstall.py new file mode 100644 index 0000000000..44e7eed652 --- /dev/null +++ b/scripts/pycairoinstall.py @@ -0,0 +1,51 @@ +import platform +import os +import sys +import urllib.request + +if 'Windows' in platform.system(): + #In case the python version is 3.6 and the system is 32-bit, try pycairo‑1.19.1‑cp37‑cp37m‑win32.whl version of cairo + if sys.version[:3]=='3.6' and platform.machine()=='x86': + urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp36-cp36m-win32.whl", "pycairo-1.19.1-cp36-cp36m-win32.whl") + os.system("pip install pycairo-1.19.1-cp36-cp36m-win32.whl") + os.remove("pycairo-1.19.1-cp37-cp37m-win32.whl") + + #In case the python version is 3.6 and the system is 64-bit, try pycairo‑1.19.1‑cp37‑cp37m‑win32.whl version of cairo + elif sys.version[:3]=='3.6' and platform.machine()=='AMD64': + urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp36-cp36m-win_amd64.whl", "pycairo-1.19.1-cp36-cp36m-win_amd64.whl") + print("Sucessfully downloaded Cairo for your system") + print("Installing Cairo") + os.system("pip install pycairo-1.19.1-cp36-cp36m-win_amd64.whl") + os.remove("pycairo-1.19.1-cp36-cp36m-win_amd64.whl") + + #In case the python version is 3.7 and the system is 32-bit, try pycairo‑1.19.1‑cp37‑cp37m‑win32.whl version of cairo + elif sys.version[:3]=='3.7' and platform.machine()=='x86': + urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp37-cp37m-win32.whl", "pycairo-1.19.1-cp37-cp37m-win32.whl") + print("Sucessfully downloaded Cairo for your system") + print("Installing Cairo") + os.system("pip install pycairo-1.19.1-cp37-cp37m-win32.whl") + os.remove("pycairo-1.19.1-cp37-cp37m-win32.whl") + + #In case the python version is 3.7 and the system is AMD64, try pycairo-1.19.1-cp37-cp37m-win_amd64.whl version of cairo + elif sys.version[:3]=='3.7' and platform.machine()=='AMD64': + urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp37-cp37m-win_amd64.whl", "pycairo-1.19.1-cp37-cp37m-win_amd64.whl") + print("Sucessfully downloaded Cairo for your system") + print("Installing Cairo") + os.system("pip install pycairo-1.19.1-cp37-cp37m-win_amd64.whl") + os.remove("pycairo-1.19.1-cp37-cp37m-win_amd64.whl") + + #In case the python version is 3.8 and the system is 32-bit, try pycairo-1.19.1-cp38-cp38-win32.whl version of cairo + elif sys.version[:3]=='3.8' and platform.machine()=='x86': + urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp38-cp38-win32.whl", "pycairo-1.19.1-cp38-cp38-win32.whl") + print("Sucessfully downloaded Cairo for your system") + print("Installing Cairo") + os.system("pip install pycairo-1.19.1-cp38-cp38-win32.whl") + os.remove("pycairo-1.19.1-cp38-cp38-win32.whl") + + #In case the python version is 3.8 and the system is AMD64, try pycairo-1.19.1-cp38-cp38-win_amd64.whl version of cairo + elif sys.version[:3]=='3.8' and platform.machine()=='AMD64': + urllib.request.urlretrieve("https://download.lfd.uci.edu/pythonlibs/s2jqpv5t/pycairo-1.19.1-cp38-cp38-win_amd64.whl", "pycairo-1.19.1-cp38-cp38-win_amd64.whl") + print("Sucessfully downloaded Cairo for your system") + print("Installing Cairo") + os.system("pip install pycairo-1.19.1-cp38-cp38-win_amd64.whl") + os.remove("pycairo-1.19.1-cp38-cp38-win_amd64.whl")