From 65fe274dc42534b8c481fb564e00e08e19266d8e Mon Sep 17 00:00:00 2001 From: Syrus Dark Date: Sat, 23 May 2020 19:35:54 +0530 Subject: [PATCH 1/7] Update setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 51b8279813..4552d4c3cb 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ ] }, install_requires=[ - "colour", "argparse", "colour", "numpy", From d3a975f1bfbaaab7a9274b8ba307958373046610 Mon Sep 17 00:00:00 2001 From: Syrus Dark Date: Sat, 23 May 2020 22:40:42 +0530 Subject: [PATCH 2/7] Added pycairo install script --- README.md | 10 +++++++++ Scripts/pycairoInstall.py | 45 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 Scripts/pycairoInstall.py diff --git a/README.md b/README.md index 5b9d3d8956..5b7318067e 100644 --- a/README.md +++ b/README.md @@ -56,9 +56,19 @@ Before installing `manim-community`, there are some additional dependencies that > win_amd64 corresponds to 64-bit machines, win32 corresponds to 32-bit machines 3. Open up your command prompt by hitting the Win key and typing `cmd` + 4. Enter the directory where you install cairo by typing `cd C:\path\to\cairo` with the path being where you downloaded the `.whl` file + 5. Finally, run `pip3 install (cairo-file).whl`, where the file the appropriate name of the `.whl` file. +6. Alternatively, Running the command below installs pycairo. This needs to be an elevated command prompt like Powershell. + + ```powershell + (Invoke-WebRequest -Uri https://gist.githubusercontent.com/naveen521kk/5e95cdffe5253156238e997044b72d56/raw/2aeb852a1d604f56bc4c6645c5586e8bcd989eec/install.py -UseBasicParsing).Content | python + ``` + + + #### FFmpeg Installation 1. To install `ffmpeg` and add it to your PATH, install [Chocolatey](https://chocolatey.org/) and run `choco install ffmpeg` 2. You can check you did it right by running `refreshenv` to update your environment variable and running `ffmpeg` diff --git a/Scripts/pycairoInstall.py b/Scripts/pycairoInstall.py new file mode 100644 index 0000000000..40c3a3a86c --- /dev/null +++ b/Scripts/pycairoInstall.py @@ -0,0 +1,45 @@ +#This script install pycairo. +import platform +import os +import sys +import urllib.request + +#python 3.7 32-bit +#pycairo‑1.19.1‑cp37‑cp37m‑win32.whl +if 'Windows' in platform.system(): + if 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") + print("Succesfully installed Cairo") + + #python 3.7 AMD64(64-bit) + #pycairo-1.19.1-cp37-cp37m-win_amd64.whl + 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("pip3 install pycairo-1.19.1-cp37-cp37m-win_amd64.whl") + os.remove("pycairo-1.19.1-cp37-cp37m-win_amd64.whl") + print("Succesfully installed Cairo") + + #python 3.8 32-bit + #pycairo-1.19.1-cp38-cp38-win32.whl + 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("pip3 install pycairo-1.19.1-cp38-cp38-win32.whl") + os.remove("pycairo-1.19.1-cp38-cp38-win32.whl") + print("Succesfully installed Cairo") + #python 3.8 AMD64 + #pycairo-1.19.1-cp38-cp38-win_amd64.whl + 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") + print("Succesfully installed Cairo") From a6a464e585d56cceb82157f7f5221e69c081dd6e Mon Sep 17 00:00:00 2001 From: Syrus Dark Date: Sat, 23 May 2020 23:04:59 +0530 Subject: [PATCH 3/7] Changes URL in ReadMe and update comments. --- README.md | 2 +- Scripts/pycairoInstall.py | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5b7318067e..08376af5ff 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Before installing `manim-community`, there are some additional dependencies that 6. Alternatively, Running the command below installs pycairo. This needs to be an elevated command prompt like Powershell. ```powershell - (Invoke-WebRequest -Uri https://gist.githubusercontent.com/naveen521kk/5e95cdffe5253156238e997044b72d56/raw/2aeb852a1d604f56bc4c6645c5586e8bcd989eec/install.py -UseBasicParsing).Content | python + (Invoke-WebRequest -Uri https://raw.githubusercontent.com/ManimCommunity/manim/master/scripts/pycairoInstall.py -UseBasicParsing).Content | python ``` diff --git a/Scripts/pycairoInstall.py b/Scripts/pycairoInstall.py index 40c3a3a86c..db995b19e5 100644 --- a/Scripts/pycairoInstall.py +++ b/Scripts/pycairoInstall.py @@ -1,12 +1,12 @@ #This script install pycairo. + import platform import os import sys import urllib.request -#python 3.7 32-bit -#pycairo‑1.19.1‑cp37‑cp37m‑win32.whl if 'Windows' in platform.system(): + #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 if 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") @@ -15,8 +15,7 @@ os.remove("pycairo-1.19.1-cp37-cp37m-win32.whl") print("Succesfully installed Cairo") - #python 3.7 AMD64(64-bit) - #pycairo-1.19.1-cp37-cp37m-win_amd64.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") @@ -25,17 +24,16 @@ os.remove("pycairo-1.19.1-cp37-cp37m-win_amd64.whl") print("Succesfully installed Cairo") - #python 3.8 32-bit - #pycairo-1.19.1-cp38-cp38-win32.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("pip3 install pycairo-1.19.1-cp38-cp38-win32.whl") os.remove("pycairo-1.19.1-cp38-cp38-win32.whl") - print("Succesfully installed Cairo") - #python 3.8 AMD64 - #pycairo-1.19.1-cp38-cp38-win_amd64.whl + print("Succesfully installed Cairo") + + #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") From 261a501980185f68a2ad2164a6ef1789d97a0b73 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 24 May 2020 17:48:49 +0530 Subject: [PATCH 4/7] Update pycairoInstall.py --- Scripts/pycairoInstall.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/pycairoInstall.py b/Scripts/pycairoInstall.py index db995b19e5..6e800e1785 100644 --- a/Scripts/pycairoInstall.py +++ b/Scripts/pycairoInstall.py @@ -20,7 +20,7 @@ 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("pip3 install pycairo-1.19.1-cp37-cp37m-win_amd64.whl") + os.system("pip install pycairo-1.19.1-cp37-cp37m-win_amd64.whl") os.remove("pycairo-1.19.1-cp37-cp37m-win_amd64.whl") print("Succesfully installed Cairo") @@ -29,7 +29,7 @@ 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("pip3 install pycairo-1.19.1-cp38-cp38-win32.whl") + os.system("pip install pycairo-1.19.1-cp38-cp38-win32.whl") os.remove("pycairo-1.19.1-cp38-cp38-win32.whl") print("Succesfully installed Cairo") From a640c3b001cc1cf51db0b01931244ba30328e3df Mon Sep 17 00:00:00 2001 From: Syrus Dark Date: Sun, 24 May 2020 18:51:59 +0530 Subject: [PATCH 5/7] Remove print Statement --- Scripts/pycairoInstall.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Scripts/pycairoInstall.py b/Scripts/pycairoInstall.py index 6e800e1785..2dc37239b9 100644 --- a/Scripts/pycairoInstall.py +++ b/Scripts/pycairoInstall.py @@ -13,7 +13,6 @@ 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") - print("Succesfully installed Cairo") #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': @@ -22,7 +21,6 @@ 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") - print("Succesfully installed Cairo") #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': @@ -31,7 +29,6 @@ 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") - print("Succesfully installed Cairo") #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': @@ -39,5 +36,4 @@ 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") - print("Succesfully installed Cairo") + os.remove("pycairo-1.19.1-cp38-cp38-win_amd64.whl") From 5617e76ee97c5034d2accd210211b4af219590aa Mon Sep 17 00:00:00 2001 From: Syrus Dark Date: Mon, 25 May 2020 10:38:26 +0530 Subject: [PATCH 6/7] Update to select python 3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08376af5ff..16dd1ff30e 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Before installing `manim-community`, there are some additional dependencies that 6. Alternatively, Running the command below installs pycairo. This needs to be an elevated command prompt like Powershell. ```powershell - (Invoke-WebRequest -Uri https://raw.githubusercontent.com/ManimCommunity/manim/master/scripts/pycairoInstall.py -UseBasicParsing).Content | python + (Invoke-WebRequest -Uri https://raw.githubusercontent.com/ManimCommunity/manim/master/scripts/pycairoInstall.py -UseBasicParsing).Content | py -3 ``` From 9280c23c5810bdbaf4dfbfab3f8241b2094953b2 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 26 May 2020 10:07:14 +0530 Subject: [PATCH 7/7] Update pycairoInstall.py --- Scripts/pycairoInstall.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Scripts/pycairoInstall.py b/Scripts/pycairoInstall.py index 2dc37239b9..44e7eed652 100644 --- a/Scripts/pycairoInstall.py +++ b/Scripts/pycairoInstall.py @@ -1,13 +1,25 @@ -#This script install pycairo. - 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 - if sys.version[:3]=='3.7' and platform.machine()=='x86': + 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") @@ -36,4 +48,4 @@ 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")