From 826e2d4f575abc4524adf755231c3853e7d98cfa Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:57 +0000
Subject: [PATCH 01/63] adios2: revision bump for python@3.8

---
 Formula/adios2.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Formula/adios2.rb b/Formula/adios2.rb
index a4d9e1d976cb0..0a632ffa5c681 100644
--- a/Formula/adios2.rb
+++ b/Formula/adios2.rb
@@ -3,6 +3,7 @@ class Adios2 < Formula
   homepage "https://adios2.readthedocs.io"
   url "https://github.com/ornladios/ADIOS2/archive/v2.5.0.tar.gz"
   sha256 "7c8ff3bf5441dd662806df9650c56a669359cb0185ea232ecb3578de7b065329"
+  revision 1
   head "https://github.com/ornladios/ADIOS2.git", :branch => "master"
 
   bottle do
@@ -19,7 +20,7 @@ class Adios2 < Formula
   depends_on "mpi4py"
   depends_on "numpy"
   depends_on "open-mpi"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "zeromq"
   uses_from_macos "bzip2"
 
@@ -49,7 +50,7 @@ def install
       -DCMAKE_DISABLE_FIND_PACKAGE_FLEX=TRUE
       -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE
       -DCMAKE_DISABLE_FIND_PACKAGE_NVSTREAM=TRUE
-      -DPYTHON_EXECUTABLE:FILEPATH=#{Formula["python"].opt_bin}/python3
+      -DPYTHON_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/python3
       -DADIOS2_BUILD_TESTING=OFF
       -DADIOS2_BUILD_EXAMPLES=OFF
     ]
@@ -71,11 +72,8 @@ def install
     system "./a.out"
     assert_predicate testpath/"myVector_cpp.bp", :exist?
 
-    system "#{Formula["python"].opt_bin}/python3",
-           "-c", "import adios2"
-
-    system "#{Formula["python"].opt_bin}/python3",
-           (pkgshare/"test/helloBPWriter.py")
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import adios2"
+    system Formula["python@3.8"].opt_bin/"python3", (pkgshare/"test/helloBPWriter.py")
     assert_predicate testpath/"npArray.bp", :exist?
   end
 end

From 6eedfef3f59dfcb993a29b867320f78c3524a8bc Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 02/63] anjuta: revision bump for python@3.8

---
 Formula/anjuta.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Formula/anjuta.rb b/Formula/anjuta.rb
index 1ba15346e1b54..e9317688c6276 100644
--- a/Formula/anjuta.rb
+++ b/Formula/anjuta.rb
@@ -3,7 +3,7 @@ class Anjuta < Formula
   homepage "http://anjuta.org"
   url "https://download.gnome.org/sources/anjuta/3.34/anjuta-3.34.0.tar.xz"
   sha256 "42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f"
-  revision 1
+  revision 2
 
   bottle do
     sha256 "b9394ffec202e2a073a98433fdb71a7f4f0855df6d579a6c719e82f2edd7a645" => :catalina
@@ -23,7 +23,7 @@ class Anjuta < Formula
   depends_on "hicolor-icon-theme"
   depends_on "libgda"
   depends_on "libxml2"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "shared-mime-info"
   depends_on "vala"
   depends_on "vte3"
@@ -35,7 +35,7 @@ def install
                           "--prefix=#{prefix}",
                           "--disable-schemas-compile"
 
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python#{xy}/site-packages"
     system "make", "install"
   end

From 6600379e248b83d3bcd8bbe2b315c86605e70045 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 03/63] apache-arrow: revision bump for python@3.8

---
 Formula/apache-arrow.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Formula/apache-arrow.rb b/Formula/apache-arrow.rb
index 65fec0fd0ff41..741b06abd95bf 100644
--- a/Formula/apache-arrow.rb
+++ b/Formula/apache-arrow.rb
@@ -4,6 +4,7 @@ class ApacheArrow < Formula
   url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-0.16.0/apache-arrow-0.16.0.tar.gz"
   mirror "https://archive.apache.org/dist/arrow/arrow-0.16.0/apache-arrow-0.16.0.tar.gz"
   sha256 "261992de4029a1593195ff4000501503bd403146471b3168bd2cc414ad0fb7f5"
+  revision 1
   head "https://github.com/apache/arrow.git"
 
   bottle do
@@ -22,7 +23,7 @@ class ApacheArrow < Formula
   depends_on "numpy"
   depends_on "openssl@1.1"
   depends_on "protobuf"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "rapidjson"
   depends_on "snappy"
   depends_on "thrift"
@@ -45,7 +46,7 @@ def install
       -DARROW_WITH_SNAPPY=ON
       -DARROW_WITH_BROTLI=ON
       -DARROW_INSTALL_NAME_RPATH=OFF
-      -DPYTHON_EXECUTABLE=#{Formula["python"].bin/"python3"}
+      -DPYTHON_EXECUTABLE=#{Formula["python@3.8"].bin/"python3"}
     ]
 
     mkdir "build"

From 214db4a7f820ba1f2ed486638a4205e444645f1b Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 04/63] arcade-learning-environment: revision bump for
 python@3.8

---
 Formula/arcade-learning-environment.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Formula/arcade-learning-environment.rb b/Formula/arcade-learning-environment.rb
index f9260774fad61..fcd5ad443b30e 100644
--- a/Formula/arcade-learning-environment.rb
+++ b/Formula/arcade-learning-environment.rb
@@ -3,6 +3,7 @@ class ArcadeLearningEnvironment < Formula
   homepage "https://github.com/mgbellemare/Arcade-Learning-Environment"
   url "https://github.com/mgbellemare/Arcade-Learning-Environment/archive/v0.6.1.tar.gz"
   sha256 "8059a4087680da03878c1648a8ceb0413a341032ecaa44bef4ef1f9f829b6dde"
+  revision 1
   head "https://github.com/mgbellemare/Arcade-Learning-Environment.git"
 
   bottle do
@@ -14,7 +15,7 @@ class ArcadeLearningEnvironment < Formula
 
   depends_on "cmake" => :build
   depends_on "numpy"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "sdl"
 
   def install
@@ -24,7 +25,7 @@ def install
     ]
     system "cmake", ".", *args
     system "make", "install"
-    system "python3", *Language::Python.setup_install_args(prefix)
+    system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(prefix)
   end
 
   test do
@@ -34,6 +35,6 @@ def install
       from ale_python_interface import ALEInterface;
       ale = ALEInterface();
     EOS
-    assert_match "ale.cfg", shell_output("python3 test.py 2>&1")
+    assert_match "ale.cfg", shell_output("#{Formula["python@3.8"].opt_bin}/python3 test.py 2>&1")
   end
 end

From 218aed48389cabc6aeda466107c3ee090b4db047 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 05/63] astrometry-net: revision bump for python@3.8

---
 Formula/astrometry-net.rb | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Formula/astrometry-net.rb b/Formula/astrometry-net.rb
index 602303c573de2..5231fbd2ad9a0 100644
--- a/Formula/astrometry-net.rb
+++ b/Formula/astrometry-net.rb
@@ -5,7 +5,7 @@ class AstrometryNet < Formula
   homepage "https://github.com/dstndstn/astrometry.net"
   url "https://github.com/dstndstn/astrometry.net/releases/download/0.79/astrometry.net-0.79.tar.gz"
   sha256 "dd5d5403cc223eb6c51a06a22a5cb893db497d1895971735321354f882c80286"
-  revision 1
+  revision 2
 
   bottle do
     cellar :any
@@ -23,26 +23,33 @@ class AstrometryNet < Formula
   depends_on "libpng"
   depends_on "netpbm"
   depends_on "numpy"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "wcslib"
 
   resource "fitsio" do
-    url "https://files.pythonhosted.org/packages/d4/51/57074746cb7c9a7f5fe8039563337fbb1edabbc2c742d2acb99b1b7c204c/fitsio-1.1.0.tar.gz"
-    sha256 "b1a8846d11c3919ea75cca611de9f76bfbdf745c4439e89e983d8a6bcfb92183"
+    url "https://files.pythonhosted.org/packages/9c/7d/99906853351108cd5abea387240b5b58109a91e349f0ae22e33c63969393/fitsio-1.1.1.tar.gz"
+    sha256 "42b88214f9d8ed34a7911c3b41a680ce1bdee4880c58e441f00010058e97c0aa"
+
+    patch do
+      url "https://patch-diff.githubusercontent.com/raw/esheldon/fitsio/pull/297.patch?full_index=1"
+      sha256 "d317355af23101b2bc49b6844ac83061a6485f4fa9741b2ecae0782972bcd675"
+    end
   end
 
   def install
+    Language::Python.rewrite_python_shebang(Formula["python@3.8"].opt_bin/"python3")
+
     ENV["NETPBM_INC"] = "-I#{Formula["netpbm"].opt_include}/netpbm"
     ENV["NETPBM_LIB"] = "-L#{Formula["netpbm"].opt_lib} -lnetpbm"
     ENV["SYSTEM_GSL"] = "yes"
-    ENV["PYTHON_SCRIPT"] = "#{libexec}/bin/python3"
-    ENV["PYTHON"] = "python3"
+    ENV["PYTHON_SCRIPT"] = Formula["python@3.8"].opt_bin/"python3"
+    ENV["PYTHON"] = Formula["python@3.8"].opt_bin/"python3"
 
-    venv = virtualenv_create(libexec, "python3")
+    venv = virtualenv_create(libexec, Formula["python@3.8"].opt_bin/"python3")
     venv.pip_install resources
 
     ENV["INSTALL_DIR"] = prefix
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV["PY_BASE_INSTALL_DIR"] = libexec/"lib/python#{xy}/site-packages/astrometry"
     ENV["PY_BASE_LINK_DIR"] = libexec/"lib/python#{xy}/site-packages/astrometry"
 
@@ -52,6 +59,8 @@ def install
   end
 
   test do
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
+    ENV["PYTHONPATH"] = libexec/"lib/python#{xy}/site-packages"
     system "#{bin}/build-astrometry-index", "-d", "3", "-o", "index-9918.fits",
                                             "-P", "18", "-S", "mag", "-B", "0.1",
                                             "-s", "0", "-r", "1", "-I", "9918", "-M",

From 8fba2f8387adedefdafb2d1e5fc9c209de654510 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 06/63] aubio: revision bump for python@3.8

---
 Formula/aubio.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Formula/aubio.rb b/Formula/aubio.rb
index b0dfb12cfb5fa..477cc4f584fc3 100644
--- a/Formula/aubio.rb
+++ b/Formula/aubio.rb
@@ -3,6 +3,7 @@ class Aubio < Formula
   homepage "https://aubio.org/"
   url "https://aubio.org/pub/aubio-0.4.9.tar.bz2"
   sha256 "d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da"
+  revision 1
 
   bottle do
     cellar :any
@@ -15,17 +16,17 @@ class Aubio < Formula
   depends_on "libtool" => :build
   depends_on "pkg-config" => :build
   depends_on "numpy"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     # Needed due to issue with recent clang (-fno-fused-madd))
     ENV.refurbish_args
 
-    system "python3", "./waf", "configure", "--prefix=#{prefix}"
-    system "python3", "./waf", "build"
-    system "python3", "./waf", "install"
+    system Formula["python@3.8"].opt_bin/"python3", "./waf", "configure", "--prefix=#{prefix}"
+    system Formula["python@3.8"].opt_bin/"python3", "./waf", "build"
+    system Formula["python@3.8"].opt_bin/"python3", "./waf", "install"
 
-    system "python3", *Language::Python.setup_install_args(prefix)
+    system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(prefix)
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end
 

From 144be4b14357e669fb5b719898c4543eb2fe5286 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 07/63] bind: revision bump for python@3.8

---
 Formula/bind.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Formula/bind.rb b/Formula/bind.rb
index 369a24f530ffc..9154d83a4d8f0 100644
--- a/Formula/bind.rb
+++ b/Formula/bind.rb
@@ -10,6 +10,7 @@ class Bind < Formula
 
   url "https://downloads.isc.org/isc/bind9/9.16.1/bind-9.16.1.tar.xz"
   sha256 "a913d7e78135b9123d233215b58102fa0f18130fb1e158465a1c2b6f3bd75e91"
+  revision 1
   version_scheme 1
   head "https://gitlab.isc.org/isc-projects/bind9.git"
 
@@ -23,7 +24,7 @@ class Bind < Formula
   depends_on "json-c"
   depends_on "libuv"
   depends_on "openssl@1.1"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "ply" do
     url "https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da/ply-3.11.tar.gz"
@@ -31,12 +32,12 @@ class Bind < Formula
   end
 
   def install
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     vendor_site_packages = libexec/"vendor/lib/python#{xy}/site-packages"
     ENV.prepend_create_path "PYTHONPATH", vendor_site_packages
     resources.each do |r|
       r.stage do
-        system "python3", *Language::Python.setup_install_args(libexec/"vendor")
+        system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
       end
     end
 
@@ -46,8 +47,9 @@ def install
     system "./configure", "--prefix=#{prefix}",
                           "--with-json-c",
                           "--with-openssl=#{Formula["openssl@1.1"].opt_prefix}",
+                          "--with-libjson=#{Formula["json-c"].opt_prefix}",
                           "--with-python-install-dir=#{vendor_site_packages}",
-                          "--with-python=#{Formula["python"].opt_bin}/python3",
+                          "--with-python=#{Formula["python@3.8"].opt_bin}/python3",
                           "--without-lmdb"
 
     system "make"

From d09a1bb6f4e8f895c5c658c53bb3d3d823df1fa7 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 08/63] boost-python3: revision bump for python@3.8

---
 Formula/boost-python3.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Formula/boost-python3.rb b/Formula/boost-python3.rb
index 8d5ff79696b2f..606560fcf4651 100644
--- a/Formula/boost-python3.rb
+++ b/Formula/boost-python3.rb
@@ -4,6 +4,7 @@ class BoostPython3 < Formula
   url "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2"
   mirror "https://dl.bintray.com/homebrew/mirror/boost_1_72_0.tar.bz2"
   sha256 "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"
+  revision 1
   head "https://github.com/boostorg/boost.git"
 
   bottle do
@@ -15,7 +16,7 @@ class BoostPython3 < Formula
 
   depends_on "numpy" => :build
   depends_on "boost"
-  depends_on "python"
+  depends_on "python@3.8"
 
   # Fix build on Xcode 11.4
   patch do
@@ -46,15 +47,15 @@ def install
     # user-config.jam below.
     inreplace "bootstrap.sh", "using python", "#using python"
 
-    pyver = Language::Python.major_minor_version "python3"
-    py_prefix = Formula["python3"].opt_frameworks/"Python.framework/Versions/#{pyver}"
+    pyver = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
+    py_prefix = Formula["python@3.8"].opt_frameworks/"Python.framework/Versions/#{pyver}"
 
     # Force boost to compile with the desired compiler
     (buildpath/"user-config.jam").write <<~EOS
       using darwin : : #{ENV.cxx} ;
       using python : #{pyver}
                    : python3
-                   : #{py_prefix}/include/python#{pyver}m
+                   : #{py_prefix}/include/python#{pyver}
                    : #{py_prefix}/lib ;
     EOS
 
@@ -87,9 +88,9 @@ def install
       }
     EOS
 
-    pyincludes = Utils.popen_read("python3-config --includes").chomp.split(" ")
-    pylib = Utils.popen_read("python3-config --ldflags").chomp.split(" ")
-    pyver = Language::Python.major_minor_version("python3").to_s.delete(".")
+    pyincludes = Utils.popen_read("#{Formula["python@3.8"].opt_bin}/python3-config --includes").chomp.split(" ")
+    pylib = Utils.popen_read("#{Formula["python@3.8"].opt_bin}/python3-config --ldflags --embed").chomp.split(" ")
+    pyver = Language::Python.major_minor_version(Formula["python@3.8"].opt_bin/"python3").to_s.delete(".")
 
     system ENV.cxx, "-shared", "hello.cpp", "-L#{lib}", "-lboost_python#{pyver}", "-o",
            "hello.so", *pyincludes, *pylib
@@ -98,6 +99,6 @@ def install
       import hello
       print(hello.greet())
     EOS
-    assert_match "Hello, world!", pipe_output("python3", output, 0)
+    assert_match "Hello, world!", pipe_output(Formula["python@3.8"].opt_bin/"python3", output, 0)
   end
 end

From b68b6fc949e1f72b8b252dc4cab04e0367255377 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 09/63] breezy: revision bump for python@3.8

---
 Formula/breezy.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Formula/breezy.rb b/Formula/breezy.rb
index 12f781d243843..fdf3c56001ef6 100644
--- a/Formula/breezy.rb
+++ b/Formula/breezy.rb
@@ -5,6 +5,7 @@ class Breezy < Formula
   homepage "https://www.breezy-vcs.org"
   url "https://files.pythonhosted.org/packages/6b/81/ae2ddb07ef93d62689a98b6b711394bfbe3e35c719253b18e6b84221d500/breezy-3.0.2.tar.gz"
   sha256 "50f16bc7faf299f98fe58573da55b0664078f94b1a0e7f0ce9e1e6a0d47e68e0"
+  revision 1
 
   bottle do
     cellar :any_skip_relocation
@@ -16,7 +17,7 @@ class Breezy < Formula
   depends_on "cython" => :build
   depends_on "gettext" => :build
   depends_on "openssl@1.1"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "configobj" do
     url "https://files.pythonhosted.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz"

From dfefc0b93ea083e413e9c4cd8a1f3d2440ca8608 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 10/63] carla: revision bump for python@3.8

---
 Formula/carla.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Formula/carla.rb b/Formula/carla.rb
index 08c3b07f616db..ff5285f5094d3 100644
--- a/Formula/carla.rb
+++ b/Formula/carla.rb
@@ -3,7 +3,7 @@ class Carla < Formula
   homepage "https://kxstudio.linuxaudio.org/Applications:Carla"
   url "https://github.com/falkTX/Carla/archive/v2.0.0.tar.gz"
   sha256 "d0c8d8417f8cce9abe807f6359231f187d60db7121ec1dccce3b596a22ef6c41"
-  revision 2
+  revision 3
   head "https://github.com/falkTX/Carla.git"
 
   bottle do
@@ -18,11 +18,14 @@ class Carla < Formula
   depends_on "liblo"
   depends_on "libmagic"
   depends_on "pyqt"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     system "make"
     system "make", "install", "PREFIX=#{prefix}"
+
+    inreplace bin/"carla", "PYTHON=$(which python3 2>/dev/null)",
+                           "PYTHON=#{Formula["python@3.8"].opt_bin}/python3"
   end
 
   test do

From b9a9dbdc09b9e651c7e46389afc5e5a297134561 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 11/63] cassandra: revision bump for python@3.8

---
 Formula/cassandra.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Formula/cassandra.rb b/Formula/cassandra.rb
index 4b12784c7e42f..fadf09568dd1a 100644
--- a/Formula/cassandra.rb
+++ b/Formula/cassandra.rb
@@ -4,6 +4,7 @@ class Cassandra < Formula
   url "https://www.apache.org/dyn/closer.lua?path=cassandra/3.11.6/apache-cassandra-3.11.6-bin.tar.gz"
   mirror "https://archive.apache.org/dist/cassandra/3.11.6/apache-cassandra-3.11.6-bin.tar.gz"
   sha256 "ce34edebd1b6bb35216ae97bd06d3efc338c05b273b78267556a99f85d30e45b"
+  revision 1
 
   bottle do
     cellar :any_skip_relocation
@@ -13,7 +14,7 @@ class Cassandra < Formula
   end
 
   depends_on "cython" => :build
-  depends_on "python"
+  depends_on "python@3.8"
 
   # Only >=Yosemite has new enough setuptools for successful compile of the below deps.
   resource "setuptools" do
@@ -50,12 +51,12 @@ def install
     (var/"lib/cassandra").mkpath
     (var/"log/cassandra").mkpath
 
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     pypath = libexec/"vendor/lib/python#{xy}/site-packages"
     ENV.prepend_create_path "PYTHONPATH", pypath
     resources.each do |r|
       r.stage do
-        system "python3", *Language::Python.setup_install_args(libexec/"vendor")
+        system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
       end
     end
 

From b6c2c378ffd8c9a76335f8a4905751b9ddf5e4dd Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 12/63] csound: revision bump for python@3.8

---
 Formula/csound.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Formula/csound.rb b/Formula/csound.rb
index fc6ab9a3d2e75..ca8ec549ff241 100644
--- a/Formula/csound.rb
+++ b/Formula/csound.rb
@@ -3,7 +3,7 @@ class Csound < Formula
   homepage "https://csound.com"
   url "https://github.com/csound/csound/archive/6.14.0.tar.gz"
   sha256 "bef349c5304b2d3431ef417933b4c9e9469c0a408a4fa4a98acf0070af360a22"
-  revision 2
+  revision 3
   head "https://github.com/csound/csound.git", :branch => "develop"
 
   bottle do
@@ -82,7 +82,7 @@ def install
 
     libexec.install buildpath/"interfaces/ctcsound.py"
 
-    python_version = Language::Python.major_minor_version "python3"
+    python_version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     (lib/"python#{python_version}/site-packages/homebrew-csound.pth").write <<~EOS
       import site; site.addsitedir('#{libexec}')
     EOS
@@ -145,7 +145,7 @@ def caveats
     system bin/"csound", "--orc", "--syntax-check-only", "opcode-existence.orc"
 
     ENV["DYLD_FRAMEWORK_PATH"] = frameworks
-    system "python3", "-c", "import ctcsound"
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import ctcsound"
     ENV.delete("DYLD_FRAMEWORK_PATH")
 
     (testpath/"test.java").write <<~EOS

From 7f68527718cfbc9a3fd1bf1c47a78b103a4ff6a3 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 13/63] cython: revision bump for python@3.8

---
 Formula/cython.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Formula/cython.rb b/Formula/cython.rb
index 5c2e301b40803..7460eb4d26aab 100644
--- a/Formula/cython.rb
+++ b/Formula/cython.rb
@@ -3,6 +3,7 @@ class Cython < Formula
   homepage "https://cython.org/"
   url "https://files.pythonhosted.org/packages/49/8a/6a4135469372da2e3d9f88f71c6d00d8a07ef65f121eeca0c7ae21697219/Cython-0.29.16.tar.gz"
   sha256 "232755284f942cbb3b43a06cd85974ef3c970a021aef19b5243c03ee2b08fa05"
+  revision 1
 
   bottle do
     cellar :any_skip_relocation
@@ -16,19 +17,19 @@ class Cython < Formula
     Users are advised to use `pip` to install cython
   EOS
 
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{xy}/site-packages"
-    system "python3", *Language::Python.setup_install_args(libexec)
+    system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec)
 
     bin.install Dir[libexec/"bin/*"]
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end
 
   test do
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_path "PYTHONPATH", libexec/"lib/python#{xy}/site-packages"
 
     phrase = "You are using Homebrew"
@@ -41,7 +42,7 @@ def install
         ext_modules = cythonize("package_manager.pyx")
       )
     EOS
-    system "python3", "setup.py", "build_ext", "--inplace"
-    assert_match phrase, shell_output("python3 -c 'import package_manager'")
+    system Formula["python@3.8"].opt_bin/"python3", "setup.py", "build_ext", "--inplace"
+    assert_match phrase, shell_output("#{Formula["python@3.8"].opt_bin}/python3 -c 'import package_manager'")
   end
 end

From 7c29f370ca297b8f6d330dc6f767784588b6e3f0 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 14/63] dvc: revision bump for python@3.8

---
 Formula/dvc.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Formula/dvc.rb b/Formula/dvc.rb
index 9a8652db4eead..cb1dcd9831a47 100644
--- a/Formula/dvc.rb
+++ b/Formula/dvc.rb
@@ -5,6 +5,7 @@ class Dvc < Formula
   homepage "https://dvc.org"
   url "https://github.com/iterative/dvc/archive/0.92.0.tar.gz"
   sha256 "660087d41fa6d02bc72a585f3f505a4a559a217fed8be762d220912f3014b3e4"
+  revision 1
 
   bottle do
     cellar :any
@@ -16,11 +17,10 @@ class Dvc < Formula
   depends_on "pkg-config" => :build
   depends_on "apache-arrow"
   depends_on "openssl@1.1"
-  # `apache-arrow` currently depends on Python 3.7
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    venv = virtualenv_create(libexec, "python3")
+    venv = virtualenv_create(libexec, Formula["python@3.8"].opt_bin/"python3")
 
     system libexec/"bin/pip", "install",
       "--no-binary", ":all:",

From f20512f4404e141b18d417ce46286b69d4d411da Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:58 +0000
Subject: [PATCH 15/63] evince: revision bump for python@3.8

---
 Formula/evince.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Formula/evince.rb b/Formula/evince.rb
index 2811bc7976ec9..370acec71415e 100644
--- a/Formula/evince.rb
+++ b/Formula/evince.rb
@@ -3,6 +3,7 @@ class Evince < Formula
   homepage "https://wiki.gnome.org/Apps/Evince"
   url "https://download.gnome.org/sources/evince/3.36/evince-3.36.0.tar.xz"
   sha256 "851d9b5234d479ab4c8f7c5cbaceb0e91ad79ccba1a7b733cde72dacc928fba8"
+  revision 1
 
   bottle do
     sha256 "c372ef0d0575ac0300002e12f0861a01c7c5336b0211df820d49dc6b250d594d" => :catalina
@@ -25,7 +26,7 @@ class Evince < Formula
   depends_on "libspectre"
   depends_on "libxml2"
   depends_on "poppler"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     ENV["GETTEXTDATADIR"] = "#{Formula["appstream-glib"].opt_share}/gettext"
@@ -45,7 +46,7 @@ def install
     # to gtk3-update-icon-cache in order to avoid a collision between gtk+ and gtk+3.
     inreplace "data/Makefile.in", "gtk-update-icon-cache", "gtk3-update-icon-cache"
 
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python#{xy}/site-packages"
 
     system "./configure", "--disable-debug",

From 48ecae9a64a34fdb31ce23421a7a5a8696ffeb14 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 16/63] gdal: revision bump for python@3.8

---
 Formula/gdal.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/gdal.rb b/Formula/gdal.rb
index d2f04a19f4046..ed9ad7ca2d1a2 100644
--- a/Formula/gdal.rb
+++ b/Formula/gdal.rb
@@ -3,7 +3,7 @@ class Gdal < Formula
   homepage "https://www.gdal.org/"
   url "https://download.osgeo.org/gdal/2.4.4/gdal-2.4.4.tar.xz"
   sha256 "a383bd3cf555d6e1169666b01b5b3025b2722ed39e834f1b65090f604405dcd8"
-  revision 2
+  revision 3
 
   bottle do
     sha256 "a1f42805a3de3f8333e981b6446661e628b5cdc06f7e9fa4c56d20fe336ba10c" => :catalina
@@ -38,7 +38,7 @@ class Gdal < Formula
   depends_on "pcre"
   depends_on "poppler"
   depends_on "proj"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "sqlite" # To ensure compatibility with SpatiaLite
   depends_on "unixodbc" # macOS version is not complete enough
   depends_on "webp"
@@ -141,7 +141,7 @@ def install
 
     # Build Python bindings
     cd "swig/python" do
-      system "python3", *Language::Python.setup_install_args(prefix)
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(prefix)
     end
     bin.install Dir["swig/python/scripts/*.py"]
 
@@ -156,6 +156,7 @@ def install
     # basic tests to see if third-party dylibs are loading OK
     system "#{bin}/gdalinfo", "--formats"
     system "#{bin}/ogrinfo", "--formats"
-    system "python3", "-c", "import gdal"
+
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import gdal"
   end
 end

From 304a0b3aadb1d24b83e596a688ae8b378cc7746f Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 17/63] gdcm: revision bump for python@3.8

---
 Formula/gdcm.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Formula/gdcm.rb b/Formula/gdcm.rb
index dcf083c0360db..b290bcd6305f5 100644
--- a/Formula/gdcm.rb
+++ b/Formula/gdcm.rb
@@ -3,7 +3,7 @@ class Gdcm < Formula
   homepage "https://sourceforge.net/projects/gdcm/"
   url "https://github.com/malaterre/GDCM/archive/v3.0.5.tar.gz"
   sha256 "5cc175d9b845db91143f972e505680e766ab814a147b16abbb34acd88dacdb5a"
-  revision 1
+  revision 2
 
   bottle do
     sha256 "c10202e17aa57c391d38bfe06e6b33eae64f2659f85c88e2be9a0ea1e040dbfd" => :catalina
@@ -17,16 +17,17 @@ class Gdcm < Formula
   depends_on "swig" => :build
   depends_on "openjpeg"
   depends_on "openssl@1.1"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "vtk"
 
   def install
     ENV.cxx11
 
-    xy = Language::Python.major_minor_version "python3"
+    python3 = Formula["python@3.8"].opt_bin/"python3"
+    xy = Language::Python.major_minor_version python3
     python_include =
-      Utils.popen_read("python3 -c 'from distutils import sysconfig;print(sysconfig.get_python_inc(True))'").chomp
-    python_executable = Utils.popen_read("python3 -c 'import sys;print(sys.executable)'").chomp
+      Utils.popen_read("#{python3} -c 'from distutils import sysconfig;print(sysconfig.get_python_inc(True))'").chomp
+    python_executable = Utils.popen_read("#{python3} -c 'import sys;print(sys.executable)'").chomp
 
     args = std_cmake_args + %W[
       -GNinja
@@ -69,6 +70,6 @@ def install
     system ENV.cxx, "-std=c++11", "test.cxx.o", "-o", "test", "-L#{lib}", "-lgdcmDSED"
     system "./test"
 
-    system "python3", "-c", "import gdcm"
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import gdcm"
   end
 end

From 31ef54be681ef390e60d90449dfa8454e270ef93 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 18/63] geos: revision bump for python@3.8

---
 Formula/geos.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Formula/geos.rb b/Formula/geos.rb
index 87d28b8a85eee..d1dd87fd0631a 100644
--- a/Formula/geos.rb
+++ b/Formula/geos.rb
@@ -3,6 +3,7 @@ class Geos < Formula
   homepage "https://trac.osgeo.org/geos"
   url "https://download.osgeo.org/geos/geos-3.8.1.tar.bz2"
   sha256 "4258af4308deb9dbb5047379026b4cd9838513627cb943a44e16c40e42ae17f7"
+  revision 1
 
   bottle do
     cellar :any
@@ -12,7 +13,7 @@ class Geos < Formula
   end
 
   depends_on "swig" => :build
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     # https://trac.osgeo.org/geos/ticket/771
@@ -24,7 +25,7 @@ def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--enable-python",
-                          "PYTHON=#{Formula["python"].opt_bin}/python3"
+                          "PYTHON=#{Formula["python@3.8"].opt_bin}/python3"
     system "make", "install"
   end
 

From 79be20f0319aed8cb3f27ff4f3817bac5e96ec7c Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 19/63] git-cola: revision bump for python@3.8

---
 Formula/git-cola.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Formula/git-cola.rb b/Formula/git-cola.rb
index d608eeeb0cf1b..fe13feeffc8a0 100644
--- a/Formula/git-cola.rb
+++ b/Formula/git-cola.rb
@@ -3,7 +3,7 @@ class GitCola < Formula
   homepage "https://git-cola.github.io/"
   url "https://github.com/git-cola/git-cola/archive/v3.6.tar.gz"
   sha256 "63369f519f81988c2d167ba2c59ad53644d3fac2b7be1e12d3f1df9b8fd91839"
-  revision 1
+  revision 2
   head "https://github.com/git-cola/git-cola.git"
 
   bottle do
@@ -15,12 +15,12 @@ class GitCola < Formula
 
   depends_on "sphinx-doc" => :build
   depends_on "pyqt"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     ENV.delete("PYTHONPATH")
-    system "make", "PYTHON=python3", "prefix=#{prefix}", "install"
-    system "make", "install-doc", "PYTHON=python3", "prefix=#{prefix}",
+    system "make", "PYTHON=#{Formula["python@3.8"].opt_bin}/python3", "prefix=#{prefix}", "install"
+    system "make", "install-doc", "PYTHON=#{Formula["python@3.8"].opt_bin}/python3}", "prefix=#{prefix}",
            "SPHINXBUILD=#{Formula["sphinx-doc"].opt_bin}/sphinx-build"
   end
 

From 86b7d7f8c3d17a2d8f701a99aaac1667429a4222 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 20/63] gnome-builder: revision bump for python@3.8

---
 Formula/gnome-builder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Formula/gnome-builder.rb b/Formula/gnome-builder.rb
index c8f6b68bf8513..86d11b9b99d41 100644
--- a/Formula/gnome-builder.rb
+++ b/Formula/gnome-builder.rb
@@ -15,7 +15,7 @@ class GnomeBuilder < Formula
   depends_on "meson" => :build
   depends_on "ninja" => :build
   depends_on "pkg-config" => :build
-  depends_on "python" => :build
+  depends_on "python@3.8" => :build
   depends_on "adwaita-icon-theme"
   depends_on "dbus"
   depends_on "gspell"
@@ -39,7 +39,7 @@ def install
     ENV["DESTDIR"] = "/"
 
     # prevent sandbox violation
-    pyver = Language::Python.major_minor_version "python3"
+    pyver = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
 
     args = %W[
       --prefix=#{prefix}

From 5db712d317b6949800941481a13a1268c4a8c15e Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 21/63] gnome-recipes: revision bump for python@3.8

---
 Formula/gnome-recipes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Formula/gnome-recipes.rb b/Formula/gnome-recipes.rb
index ba3cf231f5582..9f1f852634a53 100644
--- a/Formula/gnome-recipes.rb
+++ b/Formula/gnome-recipes.rb
@@ -3,7 +3,7 @@ class GnomeRecipes < Formula
   homepage "https://wiki.gnome.org/Apps/Recipes"
   url "https://download.gnome.org/sources/gnome-recipes/2.0/gnome-recipes-2.0.2.tar.xz"
   sha256 "1be9d2fcb7404a97aa029d2409880643f15071c37039247a6a4320e7478cd5fb"
-  revision 10
+  revision 11
 
   bottle do
     sha256 "1bd7f5d9f6adb0f4855ff1ae2d1d6a024f1d635f064dc86407a4088a8109f749" => :catalina
@@ -15,7 +15,7 @@ class GnomeRecipes < Formula
   depends_on "meson" => :build
   depends_on "ninja" => :build
   depends_on "pkg-config" => :build
-  depends_on "python" => :build
+  depends_on "python@3.8" => :build
   depends_on "adwaita-icon-theme"
   depends_on "gnome-autoar"
   depends_on "gnu-tar"

From b7bc7a70ccbc83d8882abd3adbcdfef75d7ef6ad Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 22/63] gobject-introspection: revision bump for python@3.8

---
 Formula/gobject-introspection.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Formula/gobject-introspection.rb b/Formula/gobject-introspection.rb
index 50f2f735c8965..0d282a3121d02 100644
--- a/Formula/gobject-introspection.rb
+++ b/Formula/gobject-introspection.rb
@@ -3,6 +3,7 @@ class GobjectIntrospection < Formula
   homepage "https://wiki.gnome.org/Projects/GObjectIntrospection"
   url "https://download.gnome.org/sources/gobject-introspection/1.64/gobject-introspection-1.64.0.tar.xz"
   sha256 "eac05a63091c81adfdc8ef34820bcc7e7778c5b9e34734d344fc9e69ddf4fc82"
+  revision 1
 
   bottle do
     sha256 "f081afaeb6049797416d98e59cc32b8e71106b810f019070e1d976bdd117a497" => :catalina
@@ -17,7 +18,7 @@ class GobjectIntrospection < Formula
   depends_on "glib"
   depends_on "libffi"
   depends_on "pkg-config"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "tutorial" do
     url "https://gist.github.com/7a0023656ccfe309337a.git",
@@ -25,6 +26,8 @@ class GobjectIntrospection < Formula
   end
 
   def install
+    Language::Python.rewrite_python_shebang(Formula["python@3.8"].opt_bin/"python3")
+
     ENV["GI_SCANNER_DISABLE_CACHE"] = "true"
     inreplace "giscanner/transformer.py", "/usr/share", "#{HOMEBREW_PREFIX}/share"
     inreplace "meson.build",
@@ -33,11 +36,12 @@ def install
 
     args = %W[
       --prefix=#{prefix}
-      -Dpython=#{Formula["python"].opt_bin}/python3
+      -Dpython=#{Formula["python@3.8"].opt_bin}/python3
     ]
 
     mkdir "build" do
       system "meson", *args, ".."
+      Language::Python.rewrite_python_shebang(Formula["python@3.8"].opt_bin/"python3")
       system "ninja", "-v"
       system "ninja", "install", "-v"
     end

From 17abff17ed026a015186951f0c3d08a19554a243 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 23/63] graph-tool: revision bump for python@3.8

---
 Formula/graph-tool.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/graph-tool.rb b/Formula/graph-tool.rb
index f4794cf3ee9cb..d970846c4abb2 100644
--- a/Formula/graph-tool.rb
+++ b/Formula/graph-tool.rb
@@ -5,6 +5,7 @@ class GraphTool < Formula
   homepage "https://graph-tool.skewed.de/"
   url "https://downloads.skewed.de/graph-tool/graph-tool-2.31.tar.bz2"
   sha256 "fbb4a7aee8baa9a9f7ded082e4976ebb3035f04bdf504eb3f9e7fbb2664fd67c"
+  revision 1
 
   bottle do
     sha256 "f203b08b9da13db53620d18d3d507fe7c8d1435471becc6eb4805254b3437260" => :catalina
@@ -26,7 +27,7 @@ class GraphTool < Formula
   depends_on "numpy"
   depends_on "py3cairo"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "scipy"
 
   resource "Cycler" do
@@ -66,8 +67,8 @@ class GraphTool < Formula
 
   def install
     system "autoreconf", "-fiv"
-    xy = Language::Python.major_minor_version "python3"
-    venv = virtualenv_create(libexec, "python3")
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
+    venv = virtualenv_create(libexec, Formula["python@3.8"].opt_bin/"python3")
 
     resources.each do |r|
       venv.pip_install_and_link r
@@ -104,6 +105,6 @@ def install
       assert g.num_edges() == 1
       assert g.num_vertices() == 2
     EOS
-    system "python3", "test.py"
+    system Formula["python@3.8"].opt_bin/"python3", "test.py"
   end
 end

From 31cb44a45ad515bebc9d840d926a3dbafa08df01 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 24/63] gst-python: revision bump for python@3.8

---
 Formula/gst-python.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Formula/gst-python.rb b/Formula/gst-python.rb
index 9648a67391fc0..abffa44a6bf70 100644
--- a/Formula/gst-python.rb
+++ b/Formula/gst-python.rb
@@ -3,6 +3,7 @@ class GstPython < Formula
   homepage "https://gstreamer.freedesktop.org/modules/gst-python.html"
   url "https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz"
   sha256 "208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8"
+  revision 1
 
   bottle do
     cellar :any
@@ -13,23 +14,22 @@ class GstPython < Formula
 
   depends_on "gst-plugins-base"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    python_version = Language::Python.major_minor_version("python3")
+    python_version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     # pygi-overrides-dir switch ensures files don't break out of sandbox.
     system "./configure", "--disable-dependency-tracking",
                           "--disable-silent-rules",
                           "--prefix=#{prefix}",
                           "--with-pygi-overrides-dir=#{lib}/python#{python_version}/site-packages/gi/overrides",
-                          "PYTHON=python3"
+                          "PYTHON=#{Formula["python@3.8"].opt_bin}/python3",
+                          "LDFLAGS=-undefined dynamic_lookup"
     system "make", "install"
   end
 
   test do
-    system "#{Formula["gstreamer"].opt_bin}/gst-inspect-1.0", "python"
-    # Without gst-python raises "TypeError: object() takes no parameters"
-    system "python3", "-c", <<~EOS
+    system Formula["python@3.8"].opt_bin/"python3", "-c", <<~EOS
       import gi
       gi.require_version('Gst', '1.0')
       from gi.repository import Gst

From face034013368f2206b2e27bbfb9e891a5d76c48 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 25/63] gtk-doc: revision bump for python@3.8

---
 Formula/gtk-doc.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Formula/gtk-doc.rb b/Formula/gtk-doc.rb
index 585145bd2bb3e..f0ffece4f91fd 100644
--- a/Formula/gtk-doc.rb
+++ b/Formula/gtk-doc.rb
@@ -3,6 +3,7 @@ class GtkDoc < Formula
   homepage "https://gitlab.gnome.org/GNOME/gtk-doc"
   url "https://download.gnome.org/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz"
   sha256 "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"
+  revision 1
 
   bottle do
     cellar :any_skip_relocation
@@ -18,7 +19,7 @@ class GtkDoc < Formula
   depends_on "docbook-xsl"
   depends_on "gettext"
   depends_on "libxml2"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "source-highlight"
 
   uses_from_macos "libxslt"
@@ -29,10 +30,10 @@ class GtkDoc < Formula
   end
 
   def install
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python#{xy}/site-packages"
     resource("Pygments").stage do
-      system "python3", *Language::Python.setup_install_args(libexec/"vendor")
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
     end
 
     system "./configure", "--disable-debug",

From 72eb1d3c21624f2ef470b49bd5add199c14c0246 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 26/63] gtranslator: revision bump for python@3.8

---
 Formula/gtranslator.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Formula/gtranslator.rb b/Formula/gtranslator.rb
index ccd96153ef817..ef5869cb282ea 100644
--- a/Formula/gtranslator.rb
+++ b/Formula/gtranslator.rb
@@ -3,6 +3,7 @@ class Gtranslator < Formula
   homepage "https://wiki.gnome.org/Design/Apps/Translator"
   url "https://download.gnome.org/sources/gtranslator/3.36/gtranslator-3.36.0.tar.xz"
   sha256 "2daa1d3b59b4a35ef54df087345b03e1703e725081f9dac543539228a715add3"
+  revision 1
 
   bottle do
     sha256 "90ddfb2acb333a7fb7ee2ab3d6de67c370cfcf05b4644c389dab6da55ae09698" => :catalina
@@ -13,7 +14,7 @@ class Gtranslator < Formula
   depends_on "meson" => :build
   depends_on "ninja" => :build
   depends_on "pkg-config" => :build
-  depends_on "python" => :build
+  depends_on "python@3.8" => :build
   depends_on "adwaita-icon-theme"
   depends_on "glib"
   depends_on "gspell"

From 28243798ee9ad18928ac17fbf1a11ebac6fbbbb1 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 27/63] itstool: revision bump for python@3.8

---
 Formula/itstool.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Formula/itstool.rb b/Formula/itstool.rb
index 75598e08b6c5a..8714902fe348b 100644
--- a/Formula/itstool.rb
+++ b/Formula/itstool.rb
@@ -3,6 +3,7 @@ class Itstool < Formula
   homepage "http://itstool.org/"
   url "https://github.com/itstool/itstool/archive/2.0.6.tar.gz"
   sha256 "bda0b08e9a1db885c9d7d1545535e9814dd8931d5b8dd5ab4a47bd769d0130c6"
+  revision 1
   head "https://github.com/itstool/itstool.git"
 
   bottle do
@@ -16,14 +17,14 @@ class Itstool < Formula
   depends_on "autoconf" => :build
   depends_on "automake" => :build
   depends_on "libxml2"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python#{xy}/site-packages"
 
     system "./autogen.sh", "--prefix=#{libexec}",
-                           "PYTHON=#{Formula["python"].opt_bin}/python3"
+                           "PYTHON=#{Formula["python@3.8"].opt_bin}/python3"
     system "make", "install"
 
     bin.install Dir["#{libexec}/bin/*"]

From 339a28b4409792c2a63c1ef676bd34159dc87856 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:25:59 +0000
Subject: [PATCH 28/63] libpeas: revision bump for python@3.8

---
 Formula/libpeas.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Formula/libpeas.rb b/Formula/libpeas.rb
index 5b9f5bb097c4e..0401435209f7e 100644
--- a/Formula/libpeas.rb
+++ b/Formula/libpeas.rb
@@ -3,6 +3,7 @@ class Libpeas < Formula
   homepage "https://developer.gnome.org/libpeas/stable/"
   url "https://download.gnome.org/sources/libpeas/1.26/libpeas-1.26.0.tar.xz"
   sha256 "a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376"
+  revision 1
 
   bottle do
     sha256 "ca5e8f34c01f0978fb82601876a7e673fde22286cff4ab74dda6ab90774fe38a" => :catalina
@@ -18,7 +19,7 @@ class Libpeas < Formula
   depends_on "gobject-introspection"
   depends_on "gtk+3"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     args = %W[

From bb7ebaa400487c42f5af8ba17a8e5f5501cd7190 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 29/63] libtorrent-rasterbar: revision bump for python@3.8

---
 Formula/libtorrent-rasterbar.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Formula/libtorrent-rasterbar.rb b/Formula/libtorrent-rasterbar.rb
index 1da9d427fbee6..306f52c9fe873 100644
--- a/Formula/libtorrent-rasterbar.rb
+++ b/Formula/libtorrent-rasterbar.rb
@@ -3,6 +3,7 @@ class LibtorrentRasterbar < Formula
   homepage "https://www.libtorrent.org/"
   url "https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_2_5/libtorrent-rasterbar-1.2.5.tar.gz"
   sha256 "84b79f85ffa4e4a5f434bf5c53b0d5a63dfea17b7623143caaa695faf61b2d1b"
+  revision 1
 
   bottle do
     cellar :any
@@ -22,9 +23,10 @@ class LibtorrentRasterbar < Formula
   depends_on "boost"
   depends_on "boost-python3"
   depends_on "openssl@1.1"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
+    pyver = Language::Python.major_minor_version(Formula["python@3.8"].bin/"python3").to_s.delete(".")
     args = %W[
       --disable-debug
       --disable-dependency-tracking
@@ -33,8 +35,10 @@ def install
       --enable-encryption
       --enable-python-binding
       --with-boost=#{Formula["boost"].opt_prefix}
-      --with-boost-python=boost_python37-mt
+      --with-boost-python=boost_python#{pyver}-mt
       PYTHON=python3
+      PYTHON_EXTRA_LIBS=#{`#{Formula["python@3.8"].opt_bin}/python3-config --libs --embed`.chomp}
+      PYTHON_EXTRA_LDFLAGS=#{`#{Formula["python@3.8"].opt_bin}/python3-config --ldflags`.chomp}
     ]
 
     if build.head?

From 93ef893a1ff8a4c16ee3cf9ba94fc33858c49052 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 30/63] libxml2: revision bump for python@3.8

---
 Formula/libxml2.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/libxml2.rb b/Formula/libxml2.rb
index 578feca19d53d..e100ea3cfef17 100644
--- a/Formula/libxml2.rb
+++ b/Formula/libxml2.rb
@@ -4,6 +4,7 @@ class Libxml2 < Formula
   url "http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz"
   mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/libxml2/libxml2-2.9.10.tar.gz"
   sha256 "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"
+  revision 1
 
   bottle do
     cellar :any
@@ -23,7 +24,7 @@ class Libxml2 < Formula
 
   keg_only :provided_by_macos
 
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "readline"
 
   uses_from_macos "zlib"
@@ -61,7 +62,7 @@ def install
       # We need to insert our include dir first
       inreplace "setup.py", "includes_dir = [",
                             "includes_dir = ['#{include}', '#{MacOS.sdk_path}/usr/include',"
-      system "python3", "setup.py", "install", "--prefix=#{prefix}"
+      system Formula["python@3.8"].opt_bin/"python3", "setup.py", "install", "--prefix=#{prefix}"
     end
   end
 
@@ -83,8 +84,8 @@ def install
     system ENV.cc, *args
     system "./test"
 
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_path "PYTHONPATH", lib/"python#{xy}/site-packages"
-    system "python3", "-c", "import libxml2"
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import libxml2"
   end
 end

From 32b12c1de33ec2ed6a2aabb25a08d415fba7d4bb Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 31/63] mat2: revision bump for python@3.8

---
 Formula/mat2.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/mat2.rb b/Formula/mat2.rb
index bd6289269dcd1..03cefe94673b0 100644
--- a/Formula/mat2.rb
+++ b/Formula/mat2.rb
@@ -3,6 +3,7 @@ class Mat2 < Formula
   homepage "https://0xacab.org/jvoisin/mat2"
   url "https://0xacab.org/jvoisin/mat2/-/archive/0.10.1/mat2-0.10.1.tar.gz"
   sha256 "5ed3d9c945d1475479a42e87879821440c66c2881db157aa480ccdcefc13d202"
+  revision 1
 
   bottle do
     cellar :any_skip_relocation
@@ -18,7 +19,7 @@ class Mat2 < Formula
   depends_on "poppler"
   depends_on "py3cairo"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "mutagen" do
     url "https://files.pythonhosted.org/packages/30/4c/5ad1a6e1ccbcfaf6462db727989c302d9d721beedd9b09c11e6f0c7065b0/mutagen-1.42.0.tar.gz"
@@ -29,7 +30,7 @@ def install
     inreplace "libmat2/exiftool.py", "/usr/bin/exiftool", "#{Formula["exiftool"].opt_bin}/exiftool"
     inreplace "libmat2/video.py", "/usr/bin/ffmpeg", "#{Formula["ffmpeg"].opt_bin}/ffmpeg"
 
-    version = Language::Python.major_minor_version("python3")
+    version = Language::Python.major_minor_version Formula["python@3.8"].bin/"python3"
     pygobject3 = Formula["pygobject3"]
     ENV["PYTHONPATH"] = lib/"python#{version}/site-packages"
     ENV.append_path "PYTHONPATH", pygobject3.opt_lib+"python#{version}/site-packages"
@@ -37,11 +38,11 @@ def install
 
     resources.each do |r|
       r.stage do
-        system "python3", *Language::Python.setup_install_args(libexec/"vendor")
+        system Formula["python@3.8"].bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
       end
     end
 
-    system "python3", *Language::Python.setup_install_args(prefix)
+    system Formula["python@3.8"].bin/"python3", *Language::Python.setup_install_args(prefix)
 
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end

From 7956a311e555ba07769b2e885e0a9038dd77cdd8 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 32/63] mpi4py: revision bump for python@3.8

---
 Formula/mpi4py.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Formula/mpi4py.rb b/Formula/mpi4py.rb
index 5f73db2abfa24..ed67d618390bb 100644
--- a/Formula/mpi4py.rb
+++ b/Formula/mpi4py.rb
@@ -3,6 +3,7 @@ class Mpi4py < Formula
   homepage "https://mpi4py.readthedocs.io"
   url "https://bitbucket.org/mpi4py/mpi4py/downloads/mpi4py-3.0.3.tar.gz"
   sha256 "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"
+  revision 1
 
   bottle do
     cellar :any
@@ -13,28 +14,28 @@ class Mpi4py < Formula
 
   depends_on "cython" => :build
   depends_on "open-mpi"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    system "#{Formula["python"].opt_bin}/python3",
+    system "#{Formula["python@3.8"].opt_bin}/python3",
            *Language::Python.setup_install_args(libexec)
 
-    system "python3", "setup.py",
+    system Formula["python@3.8"].bin/"python3", "setup.py",
       "build", "--mpicc=mpicc -shared", "--parallel=#{ENV.make_jobs}",
       "install", "--prefix=#{prefix}",
       "--single-version-externally-managed", "--record=installed.txt"
   end
 
   test do
-    system "#{Formula["python"].opt_bin}/python3",
+    system Formula["python@3.8"].opt_bin/"python3",
            "-c", "import mpi4py"
-    system "#{Formula["python"].opt_bin}/python3",
+    system Formula["python@3.8"].opt_bin/"python3",
            "-c", "import mpi4py.MPI"
-    system "#{Formula["python"].opt_bin}/python3",
+    system Formula["python@3.8"].opt_bin/"python3",
            "-c", "import mpi4py.futures"
-    system "mpiexec", "-n", "4", "#{Formula["python"].opt_bin}/python3",
+    system "mpiexec", "-n", "4", Formula["python@3.8"].opt_bin/"python3",
            "-m", "mpi4py.run", "-m", "mpi4py.bench", "helloworld"
-    system "mpiexec", "-n", "4", "#{Formula["python"].opt_bin}/python3",
+    system "mpiexec", "-n", "4", Formula["python@3.8"].opt_bin/"python3",
            "-m", "mpi4py.run", "-m", "mpi4py.bench", "ringtest",
            "-l", "10", "-n", "1024"
   end

From 52040729a6f18bf08effca85a7f85028fe8d9e6c Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 33/63] numpy: revision bump for python@3.8

---
 Formula/numpy.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/numpy.rb b/Formula/numpy.rb
index 27dfb10d003bc..d96d536432dbe 100644
--- a/Formula/numpy.rb
+++ b/Formula/numpy.rb
@@ -3,6 +3,7 @@ class Numpy < Formula
   homepage "https://www.numpy.org/"
   url "https://files.pythonhosted.org/packages/84/1e/ff467ac56bfeaea51d4a2e72d315c1fe440b20192fea7e460f0f248acac8/numpy-1.18.2.zip"
   sha256 "e7894793e6e8540dbeac77c87b489e331947813511108ae097f1715c018b8f3d"
+  revision 1
   head "https://github.com/numpy/numpy.git"
 
   bottle do
@@ -15,7 +16,7 @@ class Numpy < Formula
   depends_on "cython" => :build
   depends_on "gcc" => :build # for gfortran
   depends_on "openblas"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     openblas = Formula["openblas"].opt_prefix
@@ -31,17 +32,17 @@ def install
 
     Pathname("site.cfg").write config
 
-    version = Language::Python.major_minor_version "python3"
+    version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_create_path "PYTHONPATH", Formula["cython"].opt_libexec/"lib/python#{version}/site-packages"
 
-    system "python3", "setup.py",
+    system Formula["python@3.8"].opt_bin/"python3", "setup.py",
       "build", "--fcompiler=gnu95", "--parallel=#{ENV.make_jobs}",
       "install", "--prefix=#{prefix}",
       "--single-version-externally-managed", "--record=installed.txt"
   end
 
   test do
-    system "python3", "-c", <<~EOS
+    system Formula["python@3.8"].opt_bin/"python3", "-c", <<~EOS
       import numpy as np
       t = np.ones((3,3), int)
       assert t.sum() == 9

From 42243502815417a65b3999a34c21d508aeece3ee Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 34/63] ocrmypdf: revision bump for python@3.8

---
 Formula/ocrmypdf.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Formula/ocrmypdf.rb b/Formula/ocrmypdf.rb
index 902661bdcd372..c8cf4a06d92b8 100644
--- a/Formula/ocrmypdf.rb
+++ b/Formula/ocrmypdf.rb
@@ -5,6 +5,7 @@ class Ocrmypdf < Formula
   homepage "https://github.com/jbarlow83/OCRmyPDF"
   url "https://files.pythonhosted.org/packages/50/d5/67ada5ade12fc0021f17932f43888999e0e06e5f36351e914381d56435b5/ocrmypdf-9.6.1.tar.gz"
   sha256 "0c84eabe943f385d0c869fa1e1383207778455661ba16775039de2e2acca6b6b"
+  revision 1
 
   bottle do
     cellar :any
@@ -23,7 +24,7 @@ class Ocrmypdf < Formula
   depends_on "libxml2"
   depends_on "pngquant"
   depends_on "pybind11"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "qpdf"
   depends_on "tesseract"
   depends_on "unpaper"
@@ -94,7 +95,7 @@ class Ocrmypdf < Formula
   end
 
   def install
-    venv = virtualenv_create(libexec, "python3")
+    venv = virtualenv_create(libexec, Formula["python@3.8"].bin/"python3")
 
     resource("Pillow").stage do
       inreplace "setup.py" do |s|

From 73e5f7dd79eac9290c797d4dac0d38f3699c360f Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 35/63] ola: revision bump for python@3.8

---
 Formula/ola.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Formula/ola.rb b/Formula/ola.rb
index eade40452c716..3c1b2dd355668 100644
--- a/Formula/ola.rb
+++ b/Formula/ola.rb
@@ -3,7 +3,7 @@ class Ola < Formula
   homepage "https://www.openlighting.org/ola/"
   url "https://github.com/OpenLightingProject/ola/releases/download/0.10.7/ola-0.10.7.tar.gz"
   sha256 "8a65242d95e0622a3553df498e0db323a13e99eeb1accc63a8a2ca8913ab31a0"
-  revision 3
+  revision 4
   head "https://github.com/OpenLightingProject/ola.git"
 
   bottle do
@@ -21,7 +21,7 @@ class Ola < Formula
   depends_on "libusb"
   depends_on "numpy"
   depends_on "protobuf@3.6"
-  depends_on "python"
+  depends_on "python@3.8"
 
   # remove in version 0.11
   patch do
@@ -30,8 +30,9 @@ class Ola < Formula
   end
 
   def install
-    protobuf_pth = Formula["protobuf@3.6"].opt_lib/"python3.7/site-packages/homebrew-protobuf.pth"
-    (buildpath/".brew_home/Library/Python/3.7/lib/python/site-packages").install_symlink protobuf_pth
+    xy = Language::Python.major_minor_version Formula["python@3.8"].bin/"python3"
+    protobuf_pth = Formula["protobuf@3.6"].opt_lib/"python#{xy}/site-packages/homebrew-protobuf.pth"
+    (buildpath/".brew_home/Library/Python/#{xy}/lib/python/site-packages").install_symlink protobuf_pth
 
     args = %W[
       --disable-fatal-warnings
@@ -43,7 +44,7 @@ def install
       --enable-rdm-tests
     ]
 
-    ENV["PYTHON"] = "python3"
+    ENV["PYTHON"] = Formula["python@3.8"].bin/"python3"
     system "autoreconf", "-fvi"
     system "./configure", *args
     system "make", "install"

From 201fcf15a82fcee60412e55372b57613273a6c0d Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 36/63] opencolorio: revision bump for python@3.8

---
 Formula/opencolorio.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Formula/opencolorio.rb b/Formula/opencolorio.rb
index 9d9be8b100d40..05fbe7bd9e16f 100644
--- a/Formula/opencolorio.rb
+++ b/Formula/opencolorio.rb
@@ -3,7 +3,7 @@ class Opencolorio < Formula
   homepage "https://opencolorio.org/"
   url "https://github.com/imageworks/OpenColorIO/archive/v1.1.1.tar.gz"
   sha256 "c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8"
-  revision 1
+  revision 2
   head "https://github.com/imageworks/OpenColorIO.git"
 
   bottle do
@@ -17,19 +17,13 @@ class Opencolorio < Formula
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
   depends_on "little-cms2"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    py3_config = `python3-config --configdir`.chomp
-    py3_include = `python3 -c "import distutils.sysconfig as s; print(s.get_python_inc())"`.chomp
-    py3_version = Language::Python.major_minor_version "python3"
-
     args = std_cmake_args + %W[
       -DCMAKE_VERBOSE_MAKEFILE=OFF
       -DPYTHON=python3
-      -DPYTHON_EXECUTABLE=#{which "python3"}
-      -DPYTHON_LIBRARY=#{py3_config}/libpython#{py3_version}.dylib
-      -DPYTHON_INCLUDE_DIR=#{py3_include}
+      -DPYTHON_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/"python3"
     ]
 
     mkdir "macbuild" do

From 40db0dbe56542959654554ba3ef971dbcfd7af18 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 37/63] opencv: revision bump for python@3.8

---
 Formula/opencv.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Formula/opencv.rb b/Formula/opencv.rb
index 1fdf8e796101d..76e2e72bf6bc7 100644
--- a/Formula/opencv.rb
+++ b/Formula/opencv.rb
@@ -3,7 +3,7 @@ class Opencv < Formula
   homepage "https://opencv.org/"
   url "https://github.com/opencv/opencv/archive/4.2.0.tar.gz"
   sha256 "9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec"
-  revision 3
+  revision 4
 
   bottle do
     sha256 "ba6068061d29aa4626365aeb644f0672b942069b51e6c9d7569559182afd7006" => :catalina
@@ -25,7 +25,7 @@ class Opencv < Formula
   depends_on "openblas"
   depends_on "openexr"
   depends_on "protobuf"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "tbb"
   depends_on "webp"
 
@@ -45,10 +45,6 @@ def install
     # Reset PYTHONPATH, workaround for https://github.com/Homebrew/homebrew-science/pull/4885
     ENV.delete("PYTHONPATH")
 
-    py3_config = `python3-config --configdir`.chomp
-    py3_include = `python3 -c "import distutils.sysconfig as s; print(s.get_python_inc())"`.chomp
-    py3_version = Language::Python.major_minor_version "python3"
-
     args = std_cmake_args + %W[
       -DCMAKE_OSX_DEPLOYMENT_TARGET=
       -DBUILD_JASPER=OFF
@@ -82,9 +78,7 @@ def install
       -DWITH_VTK=OFF
       -DBUILD_opencv_python2=OFF
       -DBUILD_opencv_python3=ON
-      -DPYTHON3_EXECUTABLE=#{which "python3"}
-      -DPYTHON3_LIBRARY=#{py3_config}/libpython#{py3_version}.dylib
-      -DPYTHON3_INCLUDE_DIR=#{py3_include}
+      -DPYTHON3_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/python3
     ]
 
     # The compiler on older Mac OS cannot build some OpenCV files using AVX2
@@ -121,7 +115,7 @@ def install
                     "-o", "test"
     assert_equal `./test`.strip, version.to_s
 
-    output = shell_output("python3 -c 'import cv2; print(cv2.__version__)'")
+    output = shell_output(Formula["python@3.8"].opt_bin/"python3 -c 'import cv2; print(cv2.__version__)'")
     assert_equal version.to_s, output.chomp
   end
 end

From bcc7ba3e0c2c3972a95a99252bb26d302ecdf6a6 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 38/63] opencv@3: revision bump for python@3.8

---
 Formula/opencv@3.rb | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Formula/opencv@3.rb b/Formula/opencv@3.rb
index ea3ccfb5b273a..8a773efb87240 100644
--- a/Formula/opencv@3.rb
+++ b/Formula/opencv@3.rb
@@ -3,7 +3,7 @@ class OpencvAT3 < Formula
   homepage "https://opencv.org/"
   url "https://github.com/opencv/opencv/archive/3.4.9.tar.gz"
   sha256 "b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a"
-  revision 2
+  revision 3
 
   bottle do
     sha256 "49565d7f268abd0ebb1ededc9161861e68e1f6a556f3f7adee9783689158fa9d" => :catalina
@@ -25,7 +25,7 @@ class OpencvAT3 < Formula
   depends_on "libtiff"
   depends_on "numpy"
   depends_on "openexr"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "tbb"
 
   resource "contrib" do
@@ -41,10 +41,6 @@ def install
     # Reset PYTHONPATH, workaround for https://github.com/Homebrew/homebrew-science/pull/4885
     ENV.delete("PYTHONPATH")
 
-    py3_config = `python3-config --configdir`.chomp
-    py3_include = `python3 -c "import distutils.sysconfig as s; print(s.get_python_inc())"`.chomp
-    py3_version = Language::Python.major_minor_version "python3"
-
     args = std_cmake_args + %W[
       -DCMAKE_OSX_DEPLOYMENT_TARGET=
       -DBUILD_JASPER=OFF
@@ -74,9 +70,7 @@ def install
       -DWITH_VTK=OFF
       -DBUILD_opencv_python2=OFF
       -DBUILD_opencv_python3=ON
-      -DPYTHON3_EXECUTABLE=#{which "python3"}
-      -DPYTHON3_LIBRARY=#{py3_config}/libpython#{py3_version}.dylib
-      -DPYTHON3_INCLUDE_DIR=#{py3_include}
+      -DPYTHON3_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/python3
     ]
 
     args << "-DENABLE_AVX=OFF" << "-DENABLE_AVX2=OFF"
@@ -106,9 +100,9 @@ def install
     system ENV.cxx, "test.cpp", "-I#{include}", "-L#{lib}", "-o", "test"
     assert_equal `./test`.strip, version.to_s
 
-    py3_version = Language::Python.major_minor_version "python3"
+    py3_version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV["PYTHONPATH"] = lib/"python#{py3_version}/site-packages"
-    output = shell_output("python3 -c 'import cv2; print(cv2.__version__)'")
+    output = shell_output(Formula["python@3.8"].opt_bin/"python3 -c 'import cv2; print(cv2.__version__)'")
     assert_equal version.to_s, output.chomp
   end
 end

From 85f7ec8ef46ca92e349ed58481d21d4dcdf6195d Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 39/63] openimageio: revision bump for python@3.8

---
 Formula/openimageio.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Formula/openimageio.rb b/Formula/openimageio.rb
index 8083c73064f44..aef7410b4dae4 100644
--- a/Formula/openimageio.rb
+++ b/Formula/openimageio.rb
@@ -4,6 +4,7 @@ class Openimageio < Formula
   url "https://github.com/OpenImageIO/oiio/archive/Release-2.1.13.0.tar.gz"
   version "2.1.13"
   sha256 "f0653582eaf386db40dc30e2d822f3235592803223079ea3b3e30e46b3dc3acf"
+  revision 1
   head "https://github.com/OpenImageIO/oiio.git"
 
   bottle do
@@ -26,7 +27,7 @@ class Openimageio < Formula
   depends_on "libtiff"
   depends_on "opencolorio"
   depends_on "openexr"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "webp"
 
   def install
@@ -44,14 +45,14 @@ def install
     ]
 
     # CMake picks up the system's python dylib, even if we have a brewed one.
-    py3ver = Language::Python.major_minor_version "python3"
-    py3prefix = Formula["python3"].opt_frameworks/"Python.framework/Versions/#{py3ver}"
+    py3ver = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
+    py3prefix = Formula["python@3.8"].opt_frameworks/"Python.framework/Versions/#{py3ver}"
 
     ENV["PYTHONPATH"] = lib/"python#{py3ver}/site-packages"
 
     args << "-DPYTHON_EXECUTABLE=#{py3prefix}/bin/python3"
     args << "-DPYTHON_LIBRARY=#{py3prefix}/lib/libpython#{py3ver}.dylib"
-    args << "-DPYTHON_INCLUDE_DIR=#{py3prefix}/include/python#{py3ver}m"
+    args << "-DPYTHON_INCLUDE_DIR=#{py3prefix}/include/python#{py3ver}"
 
     # CMake picks up boost-python instead of boost-python3
     args << "-DBOOST_ROOT=#{Formula["boost"].opt_prefix}"
@@ -79,6 +80,6 @@ def install
       import OpenImageIO
       print(OpenImageIO.VERSION_STRING)
     EOS
-    assert_match version.to_s, pipe_output("python3", output, 0)
+    assert_match version.to_s, pipe_output(Formula["python@3.8"].opt_bin/"python3", output, 0)
   end
 end

From 0bd82c82c0519b27fafc6af8f96d702b736cff8d Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 40/63] protobuf@3.6: revision bump for python@3.8

---
 Formula/protobuf@3.6.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Formula/protobuf@3.6.rb b/Formula/protobuf@3.6.rb
index 8a3ed1bb01d53..185af7102a286 100644
--- a/Formula/protobuf@3.6.rb
+++ b/Formula/protobuf@3.6.rb
@@ -3,7 +3,7 @@ class ProtobufAT36 < Formula
   homepage "https://github.com/protocolbuffers/protobuf/"
   url "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.3.tar.gz"
   sha256 "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a"
-  revision 1
+  revision 2
 
   bottle do
     cellar :any
@@ -19,7 +19,7 @@ class ProtobufAT36 < Formula
   depends_on "automake" => :build
   depends_on "cmake" => :build
   depends_on "libtool" => :build
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "six" do
     url "https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz"
@@ -58,14 +58,14 @@ def install
     ENV.append_to_cflags "-L#{lib}"
 
     resource("six").stage do
-      system "python3", *Language::Python.setup_install_args(libexec)
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec)
     end
     chdir "python" do
-      system "python3", *Language::Python.setup_install_args(libexec),
-                        "--cpp_implementation"
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec),
+                                                      "--cpp_implementation"
     end
 
-    version = Language::Python.major_minor_version "python3"
+    version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     site_packages = "lib/python#{version}/site-packages"
     pth_contents = "import site; site.addsitedir('#{libexec/site_packages}')\n"
     (prefix/site_packages/"homebrew-protobuf.pth").write pth_contents

From f5024d3de3c521c0355c6da59c53d174f27232b0 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:00 +0000
Subject: [PATCH 41/63] py3cairo: revision bump for python@3.8

---
 Formula/py3cairo.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Formula/py3cairo.rb b/Formula/py3cairo.rb
index e11c485f99139..55d7b1b7c91e8 100644
--- a/Formula/py3cairo.rb
+++ b/Formula/py3cairo.rb
@@ -3,6 +3,7 @@ class Py3cairo < Formula
   homepage "https://cairographics.org/pycairo/"
   url "https://github.com/pygobject/pycairo/releases/download/v1.19.1/pycairo-1.19.1.tar.gz"
   sha256 "2c143183280feb67f5beb4e543fd49990c28e7df427301ede04fc550d3562e84"
+  revision 1
 
   bottle do
     cellar :any
@@ -13,13 +14,13 @@ class Py3cairo < Formula
 
   depends_on "pkg-config" => :build
   depends_on "cairo"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    system "python3", *Language::Python.setup_install_args(prefix)
+    system Formula["python@3.8"].bin/"python3", *Language::Python.setup_install_args(prefix)
   end
 
   test do
-    system "python3", "-c", "import cairo; print(cairo.version)"
+    system Formula["python@3.8"].bin/"python3", "-c", "import cairo; print(cairo.version)"
   end
 end

From e605ab9cc421b9ae864df6a3225ed3da40d9194e Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 42/63] pybind11: revision bump for python@3.8

---
 Formula/pybind11.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Formula/pybind11.rb b/Formula/pybind11.rb
index feb9bd3af7d70..6f871ee4bbdea 100644
--- a/Formula/pybind11.rb
+++ b/Formula/pybind11.rb
@@ -3,6 +3,7 @@ class Pybind11 < Formula
   homepage "https://github.com/pybind/pybind11"
   url "https://github.com/pybind/pybind11/archive/v2.4.3.tar.gz"
   sha256 "1eed57bc6863190e35637290f97a20c81cfe4d9090ac0a24f3bbf08f265eb71d"
+  revision 1
 
   bottle do
     cellar :any_skip_relocation
@@ -12,7 +13,7 @@ class Pybind11 < Formula
   end
 
   depends_on "cmake" => :build
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     system "cmake", ".", "-DPYBIND11_TEST=OFF", *std_cmake_args
@@ -39,8 +40,8 @@ def install
       example.add(1,2)
     EOS
 
-    python_flags = `python3-config --cflags --ldflags`.split(" ")
+    python_flags = `#{Formula["python@3.8"].opt_bin}/python3-config --cflags --ldflags --embed`.split(" ")
     system ENV.cxx, "-O3", "-shared", "-std=c++11", *python_flags, "example.cpp", "-o", "example.so"
-    system "python3", "example.py"
+    system Formula["python@3.8"].opt_bin/"python3", "example.py"
   end
 end

From dc1fb84e6c682d3adf4fa11abca0a247c637b0db Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 43/63] pygobject3: revision bump for python@3.8

---
 Formula/pygobject3.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/pygobject3.rb b/Formula/pygobject3.rb
index 642954ee97182..aee9b983a15c2 100644
--- a/Formula/pygobject3.rb
+++ b/Formula/pygobject3.rb
@@ -3,6 +3,7 @@ class Pygobject3 < Formula
   homepage "https://wiki.gnome.org/Projects/PyGObject"
   url "https://download.gnome.org/sources/pygobject/3.36/pygobject-3.36.0.tar.xz"
   sha256 "8683d2dfb5baa9e501a9a64eeba5c2c1117eadb781ab1cd7a9d255834af6daef"
+  revision 1
 
   bottle do
     cellar :any
@@ -16,13 +17,13 @@ class Pygobject3 < Formula
   depends_on "pkg-config" => :build
   depends_on "gobject-introspection"
   depends_on "py3cairo"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     mkdir "buildpy3" do
       system "meson", "--prefix=#{prefix}",
                       "-Dpycairo=true",
-                      "-Dpython=python3",
+                      "-Dpython=#{Formula["python@3.8"].opt_bin}/python3",
                       ".."
       system "ninja", "-v"
       system "ninja", "install", "-v"
@@ -38,8 +39,8 @@ def install
       assert(31 == GLib.Date.get_days_in_month(GLib.DateMonth.JANUARY, 2000))
     EOS
 
-    pyversion = Language::Python.major_minor_version "python3"
+    pyversion = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_path "PYTHONPATH", lib/"python#{pyversion}/site-packages"
-    system "python3", "test.py"
+    system Formula["python@3.8"].opt_bin/"python3", "test.py"
   end
 end

From fbec34407282c029ac4e9e2f35483490ef96d811 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 44/63] pyqt: revision bump for python@3.8

---
 Formula/pyqt.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Formula/pyqt.rb b/Formula/pyqt.rb
index 595b7c8530032..6ac4519b64080 100644
--- a/Formula/pyqt.rb
+++ b/Formula/pyqt.rb
@@ -3,6 +3,7 @@ class Pyqt < Formula
   homepage "https://www.riverbankcomputing.com/software/pyqt/download5"
   url "https://files.pythonhosted.org/packages/7c/5b/e760ec4f868cb77cee45b4554bf15d3fe6972176e89c4e3faac941213694/PyQt5-5.14.0.tar.gz"
   sha256 "0145a6b7de15756366decb736c349a0cb510d706c83fda5b8cd9e0557bc1da72"
+  revision 1
 
   bottle do
     cellar :any
@@ -11,12 +12,12 @@ class Pyqt < Formula
     sha256 "32f1de6e98558bbf79e31771cfa6bce4206bac12108f384324006c1a18209dfc" => :high_sierra
   end
 
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "qt"
   depends_on "sip"
 
   def install
-    version = Language::Python.major_minor_version "python3"
+    version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     args = ["--confirm-license",
             "--bindir=#{bin}",
             "--destdir=#{lib}/python#{version}/site-packages",
@@ -29,9 +30,10 @@ def install
             "QMAKE_MACOSX_DEPLOYMENT_TARGET=#{MacOS.version}",
             "--designer-plugindir=#{pkgshare}/plugins",
             "--qml-plugindir=#{pkgshare}/plugins",
+            "--pyuic5-interpreter=#{Formula["python@3.8"].opt_bin}/python3",
             "--verbose"]
 
-    system "python3", "configure.py", *args
+    system Formula["python@3.8"].opt_bin/"python3", "configure.py", *args
     system "make"
     ENV.deparallelize { system "make", "install" }
   end
@@ -40,7 +42,7 @@ def install
     system "#{bin}/pyuic5", "--version"
     system "#{bin}/pylupdate5", "-version"
 
-    system "python3", "-c", "import PyQt5"
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import PyQt5"
     %w[
       Gui
       Location
@@ -50,6 +52,6 @@ def install
       Svg
       Widgets
       Xml
-    ].each { |mod| system "python3", "-c", "import PyQt5.Qt#{mod}" }
+    ].each { |mod| system Formula["python@3.8"].opt_bin/"python3", "-c", "import PyQt5.Qt#{mod}" }
   end
 end

From 78bf81f9d0842f0b3ea0f5e1ebd2b4e460e3dab5 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 45/63] pytouhou: revision bump for python@3.8

---
 Formula/pytouhou.rb | 76 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/Formula/pytouhou.rb b/Formula/pytouhou.rb
index 7f7eface056a2..d65f602b972d1 100644
--- a/Formula/pytouhou.rb
+++ b/Formula/pytouhou.rb
@@ -3,7 +3,7 @@ class Pytouhou < Formula
   homepage "https://pytouhou.linkmauve.fr/"
   url "https://hg.linkmauve.fr/touhou", :revision => "5270c34b4c00", :using => :hg
   version "634"
-  revision 6
+  revision 7
   head "https://hg.linkmauve.fr/touhou", :using => :hg
 
   bottle do
@@ -19,28 +19,32 @@ class Pytouhou < Formula
   depends_on "libepoxy"
   depends_on "py3cairo"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "sdl2"
   depends_on "sdl2_image"
   depends_on "sdl2_mixer"
   depends_on "sdl2_ttf"
 
   resource "Cython" do
-    url "https://files.pythonhosted.org/packages/b3/ae/971d3b936a7ad10e65cb7672356cff156000c5132cf406cb0f4d7a980fd3/Cython-0.28.3.tar.gz"
-    sha256 "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526"
+    url "https://files.pythonhosted.org/packages/a5/1f/c7c5450c60a90ce058b47ecf60bb5be2bfe46f952ed1d3b95d1d677588be/Cython-0.29.13.tar.gz"
+    sha256 "c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e"
   end
 
+  # Fix for parallel cythonize
+  # It just put setup call in `if __name__ == '__main__'` block
+  patch :p0, :DATA
+
   def install
-    pyver = Language::Python.major_minor_version "python3"
+    pyver = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python#{pyver}/site-packages"
     resource("Cython").stage do
-      system "python3", *Language::Python.setup_install_args(libexec/"vendor")
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
     end
 
     # hg can't determine revision number (no .hg on the stage)
     inreplace "setup.py", /(version)=.+,$/, "\\1='#{version}',"
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{pyver}/site-packages"
-    system "python3", *Language::Python.setup_install_args(libexec)
+    system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec)
 
     # Set default game path to pkgshare
     inreplace "#{libexec}/bin/pytouhou", /('path'): '\.'/, "\\1: '#{pkgshare}/game'"
@@ -61,3 +65,61 @@ def caveats
     system "#{bin}/pytouhou", "--help"
   end
 end
+
+__END__
+--- setup.py	2019-10-21 08:55:06.000000000 +0100
++++ setup.py	2019-10-21 08:56:15.000000000 +0100
+@@ -172,29 +172,29 @@
+ if not os.path.exists(temp_data_dir):
+     os.symlink(os.path.join(current_dir, 'data'), temp_data_dir)
+
++if __name__ == '__main__':
++    setup(name='PyTouhou',
++        version=check_output(['hg', 'heads', '.', '-T', '{rev}']).decode(),
++        author='Thibaut Girka',
++        author_email='thib@sitedethib.com',
++        url='http://pytouhou.linkmauve.fr/',
++        license='GPLv3',
++        py_modules=py_modules,
++        ext_modules=cythonize(ext_modules, nthreads=nthreads, annotate=debug,
++                                language_level=3,
++                                compiler_directives={'infer_types': True,
++                                                    'infer_types.verbose': debug,
++                                                    'profile': debug},
++                                compile_time_env={'MAX_TEXTURES': 128,
++                                                'MAX_ELEMENTS': 640 * 4 * 3,
++                                                'MAX_SOUNDS': 26,
++                                                'USE_OPENGL': use_opengl}),
++        scripts=['scripts/pytouhou'] + (['scripts/anmviewer'] if anmviewer else []),
++        packages=['pytouhou'],
++        package_data={'pytouhou': ['data/menu.glade']},
++        **extra)
+
+-setup(name='PyTouhou',
+-      version=check_output(['hg', 'heads', '.', '-T', '{rev}']).decode(),
+-      author='Thibaut Girka',
+-      author_email='thib@sitedethib.com',
+-      url='http://pytouhou.linkmauve.fr/',
+-      license='GPLv3',
+-      py_modules=py_modules,
+-      ext_modules=cythonize(ext_modules, nthreads=nthreads, annotate=debug,
+-                            language_level=3,
+-                            compiler_directives={'infer_types': True,
+-                                                 'infer_types.verbose': debug,
+-                                                 'profile': debug},
+-                            compile_time_env={'MAX_TEXTURES': 128,
+-                                              'MAX_ELEMENTS': 640 * 4 * 3,
+-                                              'MAX_SOUNDS': 26,
+-                                              'USE_OPENGL': use_opengl}),
+-      scripts=['scripts/pytouhou'] + (['scripts/anmviewer'] if anmviewer else []),
+-      packages=['pytouhou'],
+-      package_data={'pytouhou': ['data/menu.glade']},
+-      **extra)
+
+-
+-# Remove the link afterwards
+-if os.path.exists(temp_data_dir):
+-    os.unlink(temp_data_dir)
++    # Remove the link afterwards
++    if os.path.exists(temp_data_dir):
++        os.unlink(temp_data_dir)

From 75f41337a8829ff91be62ccc5f318b402a49b608 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 46/63] qscintilla2: revision bump for python@3.8

---
 Formula/qscintilla2.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/qscintilla2.rb b/Formula/qscintilla2.rb
index 292ed4b609c18..d9cbc9c09e095 100644
--- a/Formula/qscintilla2.rb
+++ b/Formula/qscintilla2.rb
@@ -3,6 +3,7 @@ class Qscintilla2 < Formula
   homepage "https://www.riverbankcomputing.com/software/qscintilla/intro"
   url "https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz"
   sha256 "723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20"
+  revision 1
 
   bottle do
     cellar :any
@@ -12,7 +13,7 @@ class Qscintilla2 < Formula
   end
 
   depends_on "pyqt"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "qt"
   depends_on "sip"
 
@@ -44,9 +45,9 @@ def install
 
     cd "Python" do
       (share/"sip").mkpath
-      version = Language::Python.major_minor_version "python3"
+      version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
       pydir = "#{lib}/python#{version}/site-packages/PyQt5"
-      system "python3", "configure.py", "-o", lib, "-n", include,
+      system Formula["python@3.8"].opt_bin/"python3", "configure.py", "-o", lib, "-n", include,
                         "--apidir=#{prefix}/qsci",
                         "--destdir=#{pydir}",
                         "--stubsdir=#{pydir}",
@@ -70,6 +71,6 @@ def install
       assert("QsciLexer" in dir(PyQt5.Qsci))
     EOS
 
-    system "python3", "test.py"
+    system Formula["python@3.8"].opt_bin/"python3", "test.py"
   end
 end

From 84f36b2db16a05357cf90968b4e7d393d18ae8ab Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 47/63] root: revision bump for python@3.8

---
 Formula/root.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Formula/root.rb b/Formula/root.rb
index 1cdf80c8b243a..b74a2ae20869f 100644
--- a/Formula/root.rb
+++ b/Formula/root.rb
@@ -4,6 +4,7 @@ class Root < Formula
   url "https://root.cern.ch/download/root_v6.20.02.source.tar.gz"
   version "6.20.02"
   sha256 "0997586bf097c0afbc6f08edbffcebf5eb6a4237262216114ba3f5c8087dcba6"
+  revision 1
   head "https://github.com/root-project/root.git"
 
   bottle do
@@ -38,7 +39,7 @@ class Root < Formula
   depends_on "numpy" # for tmva
   depends_on "openssl@1.1"
   depends_on "pcre"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "tbb"
   depends_on "xrootd"
   depends_on "xz" # for LZMA
@@ -58,17 +59,10 @@ def install
               "http://lcgpackages",
               "https://lcgpackages"
 
-    py_exe = Utils.popen_read("which python3").strip
-    py_prefix = Utils.popen_read("python3 -c 'import sys;print(sys.prefix)'").chomp
-    py_inc =
-      Utils.popen_read("python3 -c 'from distutils import sysconfig;print(sysconfig.get_python_inc(True))'").chomp
-
     args = std_cmake_args + %W[
       -DCLING_CXX_PATH=clang++
       -DCMAKE_INSTALL_ELISPDIR=#{elisp}
-      -DPYTHON_EXECUTABLE=#{py_exe}
-      -DPYTHON_INCLUDE_DIR=#{py_inc}
-      -DPYTHON_LIBRARY=#{py_prefix}/Python
+      -DPYTHON_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/python3
       -Dbuiltin_cfitsio=OFF
       -Dbuiltin_freetype=ON
       -Ddavix=ON
@@ -166,6 +160,6 @@ def caveats
 
     # Test Python module
     ENV["PYTHONPATH"] = lib/"root"
-    system "python3", "-c", "import ROOT; ROOT.gSystem.LoadAllLibraries()"
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import ROOT; ROOT.gSystem.LoadAllLibraries()"
   end
 end

From 8f2fa1ea133e68e9afa0162e4ef74ecea94fd316 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 48/63] scipy: revision bump for python@3.8

---
 Formula/scipy.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Formula/scipy.rb b/Formula/scipy.rb
index c07e333138176..7f3699779977f 100644
--- a/Formula/scipy.rb
+++ b/Formula/scipy.rb
@@ -3,7 +3,7 @@ class Scipy < Formula
   homepage "https://www.scipy.org"
   url "https://files.pythonhosted.org/packages/04/ab/e2eb3e3f90b9363040a3d885ccc5c79fe20c5b8a3caa8fe3bf47ff653260/scipy-1.4.1.tar.gz"
   sha256 "dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59"
-  revision 1
+  revision 2
   head "https://github.com/scipy/scipy.git"
 
   bottle do
@@ -18,7 +18,7 @@ class Scipy < Formula
   depends_on "numpy"
   depends_on "openblas"
   depends_on "pybind11"
-  depends_on "python"
+  depends_on "python@3.8"
 
   cxxstdlib_check :skip
 
@@ -39,11 +39,11 @@ def install
 
     Pathname("site.cfg").write config
 
-    version = Language::Python.major_minor_version "python3"
+    version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV["PYTHONPATH"] = Formula["numpy"].opt_lib/"python#{version}/site-packages"
     ENV.prepend_create_path "PYTHONPATH", lib/"python#{version}/site-packages"
-    system "python3", "setup.py", "build", "--fcompiler=gnu95"
-    system "python3", *Language::Python.setup_install_args(prefix)
+    system Formula["python@3.8"].opt_bin/"python3", "setup.py", "build", "--fcompiler=gnu95"
+    system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(prefix)
   end
 
   # cleanup leftover .pyc files from previous installs which can cause problems
@@ -53,6 +53,6 @@ def post_install
   end
 
   test do
-    system "python3", "-c", "import scipy"
+    system Formula["python@3.8"].opt_bin/"python3", "-c", "import scipy"
   end
 end

From 472174972f98b276259ac68a9e9efc6aca461f11 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 49/63] sip: revision bump for python@3.8

---
 Formula/sip.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Formula/sip.rb b/Formula/sip.rb
index c22ab69635232..5ffba19ec0821 100644
--- a/Formula/sip.rb
+++ b/Formula/sip.rb
@@ -3,6 +3,7 @@ class Sip < Formula
   homepage "https://www.riverbankcomputing.com/software/sip/intro"
   url "https://www.riverbankcomputing.com/static/Downloads/sip/4.19.21/sip-4.19.21.tar.gz"
   sha256 "6af9979ab41590e8311b8cc94356718429ef96ba0e3592bdd630da01211200ae"
+  revision 1
   head "https://www.riverbankcomputing.com/hg/sip", :using => :hg
 
   bottle do
@@ -12,10 +13,10 @@ class Sip < Formula
     sha256 "aa8a6c4122d15687e8f279ad342d1a1a232aa658e0179ac38f67c1a2e0a26f8c" => :high_sierra
   end
 
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    ENV.prepend_path "PATH", Formula["python"].opt_libexec/"bin"
+    ENV.prepend_path "PATH", Formula["python@3.8"].opt_bin
     ENV.delete("SDKROOT") # Avoid picking up /Application/Xcode.app paths
 
     if build.head?

From c7ae1697b28707801a5329db025db51dd1a8bdcd Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 50/63] tbb: revision bump for python@3.8

---
 Formula/tbb.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Formula/tbb.rb b/Formula/tbb.rb
index 630110cdd96d4..670a3fcf69ba6 100644
--- a/Formula/tbb.rb
+++ b/Formula/tbb.rb
@@ -14,7 +14,7 @@ class Tbb < Formula
 
   depends_on "cmake" => :build
   depends_on "swig" => :build
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
     compiler = (ENV.compiler == :clang) ? "clang" : "gcc"
@@ -29,7 +29,7 @@ def install
 
     cd "python" do
       ENV["TBBROOT"] = prefix
-      system "python3", *Language::Python.setup_install_args(prefix)
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(prefix)
     end
 
     system "cmake", *std_cmake_args,

From 5451e80916c1a80303178247e979debf3c34c243 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 51/63] template-glib: revision bump for python@3.8

---
 Formula/template-glib.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Formula/template-glib.rb b/Formula/template-glib.rb
index 48f6a179b17d8..cc104db703ea5 100644
--- a/Formula/template-glib.rb
+++ b/Formula/template-glib.rb
@@ -3,6 +3,7 @@ class TemplateGlib < Formula
   homepage "https://gitlab.gnome.org/GNOME/template-glib"
   url "https://download.gnome.org/sources/template-glib/3.34/template-glib-3.34.0.tar.xz"
   sha256 "216bef6ac3607666b8ca72b936467f7020ce6421c02755c301d079576c9c3dfd"
+  revision 1
 
   bottle do
     cellar :any
@@ -16,7 +17,7 @@ class TemplateGlib < Formula
   depends_on "meson" => :build
   depends_on "ninja" => :build
   depends_on "pkg-config" => :build
-  depends_on "python" => :build
+  depends_on "python@3.8" => :build
   depends_on "glib"
   depends_on "gobject-introspection"
 

From a9ee4c48a3c2653d64cf9d520a96a51b11e864b3 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 52/63] urh: revision bump for python@3.8

---
 Formula/urh.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Formula/urh.rb b/Formula/urh.rb
index 763bdc5ce5a3d..ebc6badef4d3e 100644
--- a/Formula/urh.rb
+++ b/Formula/urh.rb
@@ -3,6 +3,7 @@ class Urh < Formula
   homepage "https://github.com/jopohl/urh"
   url "https://files.pythonhosted.org/packages/81/6e/730980db1ea8066a46923f58184e235ff89bb786bb677d290a1d48249a25/urh-2.8.4.tar.gz"
   sha256 "64a85cd3b0407276fc1751623284c8ebcf48fa657a1eee330163d3a5f1505f7f"
+  revision 1
   head "https://github.com/jopohl/urh.git"
 
   bottle do
@@ -15,7 +16,7 @@ class Urh < Formula
   depends_on "hackrf"
   depends_on "numpy"
   depends_on "pyqt"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "zeromq"
 
   resource "Cython" do
@@ -34,13 +35,13 @@ class Urh < Formula
   end
 
   def install
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python#{xy}/site-packages"
     resources.each do |r|
       next if r.name == "Cython"
 
       r.stage do
-        system "python3", *Language::Python.setup_install_args(libexec/"vendor")
+        system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
       end
     end
 
@@ -49,17 +50,17 @@ def install
     ENV.prepend_create_path "PYTHONPATH", buildpath/"cython/lib/python#{xy}/site-packages"
 
     resource("Cython").stage do
-      system "python3", *Language::Python.setup_install_args(buildpath/"cython")
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(buildpath/"cython")
     end
 
-    system "python3", *Language::Python.setup_install_args(libexec)
+    system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec)
 
     bin.install Dir[libexec/"bin/*"]
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => saved_python_path)
   end
 
   test do
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python#{xy}/site-packages"
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{xy}/site-packages"
     (testpath/"test.py").write <<~EOS
@@ -68,6 +69,6 @@ def install
       expected = [0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0]
       assert(expected == c.crc([0, 1, 0, 1, 1, 0, 1, 0]).tolist())
     EOS
-    system "python3", "test.py"
+    system Formula["python@3.8"].opt_bin/"python3", "test.py"
   end
 end

From fbcfc56bf9961567d43b0282af617f272b0e5908 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 53/63] vtk: revision bump for python@3.8

---
 Formula/vtk.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Formula/vtk.rb b/Formula/vtk.rb
index 3f48ac9e98534..bce321c61ed54 100644
--- a/Formula/vtk.rb
+++ b/Formula/vtk.rb
@@ -1,7 +1,7 @@
 class Vtk < Formula
   desc "Toolkit for 3D computer graphics, image processing, and visualization"
   homepage "https://www.vtk.org/"
-  revision 8
+  revision 9
   head "https://github.com/Kitware/VTK.git"
 
   stable do
@@ -13,6 +13,12 @@ class Vtk < Formula
       url "https://gitlab.kitware.com/vtk/vtk/commit/ca3b5a50d945b6e65f0e764b3138cad17bd7eb8d.diff"
       sha256 "b9f7a3ebf3c29f3cad4327eb15844ac0ee849755b148b60fef006314de8e822e"
     end
+
+    # Python 3.8 compatibility
+    patch do
+      url "https://gitlab.kitware.com/vtk/vtk/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff"
+      sha256 "572c06a4ba279a133bfdcf0190fec2eff5f330fa85ad6a2a0b0f6dfdea01ca69"
+    end
   end
 
   bottle do
@@ -30,12 +36,11 @@ class Vtk < Formula
   depends_on "libtiff"
   depends_on "netcdf"
   depends_on "pyqt"
-  depends_on "python"
+  depends_on "python@3.8"
   depends_on "qt"
 
   def install
     pyver = Language::Python.major_minor_version "python3"
-    py_prefix = Formula["python3"].opt_frameworks/"Python.framework/Versions/#{pyver}"
     args = std_cmake_args + %W[
       -DBUILD_SHARED_LIBS=ON
       -DBUILD_TESTING=OFF
@@ -56,9 +61,7 @@ def install
       -DVTK_USE_SYSTEM_ZLIB=ON
       -DVTK_WRAP_PYTHON=ON
       -DVTK_PYTHON_VERSION=3
-      -DPYTHON_EXECUTABLE=#{Formula["python"].opt_bin}/python3
-      -DPYTHON_INCLUDE_DIR=#{py_prefix}/include/python#{pyver}m
-      -DPYTHON_LIBRARY=#{py_prefix}/lib/libpython#{pyver}.dylib
+      -DPYTHON_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/python3
       -DVTK_INSTALL_PYTHON_MODULE_DIR=#{lib}/python#{pyver}/site-packages
       -DVTK_QT_VERSION:STRING=5
       -DVTK_Group_Qt=ON

From 753bf137a3eb76493b75a93b7160bd3966014f9b Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 54/63] wxpython: revision bump for python@3.8

---
 Formula/wxpython.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/wxpython.rb b/Formula/wxpython.rb
index 7d60f98fed2bf..95279c4ba77e1 100644
--- a/Formula/wxpython.rb
+++ b/Formula/wxpython.rb
@@ -6,6 +6,7 @@ class Wxpython < Formula
   url "https://files.pythonhosted.org/packages/b9/8b/31267dd6d026a082faed35ec8d97522c0236f2e083bf15aff64d982215e1/wxPython-4.0.7.post2.tar.gz"
   version "4.0.7.post2"
   sha256 "5a229e695b64f9864d30a5315e0c1e4ff5e02effede0a07f16e8d856737a0c4e"
+  revision 1
 
   bottle do
     cellar :any
@@ -19,7 +20,7 @@ class Wxpython < Formula
   depends_on "libpng"
   depends_on "libtiff"
   depends_on "numpy"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "Pillow" do
     url "https://files.pythonhosted.org/packages/5b/bb/cdc8086db1f15d0664dd22a62c69613cdc00f1dd430b5b19df1bea83f2a3/Pillow-6.2.1.tar.gz"
@@ -45,7 +46,7 @@ def install
               /^( +)(wxpy_configure_opts.append\("--disable-qtkit"\))/,
               "\\1\\2\n\\1wxpy_configure_opts.append(\"--disable-precomp-headers\")"
 
-    venv = virtualenv_create(libexec, "python3")
+    venv = virtualenv_create(libexec, Formula["python@3.8"].opt_bin/"python3")
 
     resource("Pillow").stage do
       inreplace "setup.py" do |s|
@@ -76,10 +77,10 @@ def install
   end
 
   test do
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_path "PYTHONPATH", libexec/"lib/python#{xy}/site-packages"
 
-    output = shell_output("python3 -c 'import wx ; print(wx.__version__)'")
+    output = shell_output("#{Formula["python@3.8"].opt_bin}/python3 -c 'import wx ; print(wx.__version__)'")
     assert_match version.to_s, output
   end
 end

From 642754f0b5586f4e88d261f97e88a506d1241baf Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Mon, 2 Dec 2019 19:26:01 +0000
Subject: [PATCH 55/63] xdot: revision bump for python@3.8

---
 Formula/xdot.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Formula/xdot.rb b/Formula/xdot.rb
index 5033a2fea6a8a..74d6e61944cd6 100644
--- a/Formula/xdot.rb
+++ b/Formula/xdot.rb
@@ -3,6 +3,7 @@ class Xdot < Formula
   homepage "https://github.com/jrfonseca/xdot.py"
   url "https://files.pythonhosted.org/packages/0f/1b/7ae17e0931ff011bba1c86000674666176021756d07ed29ce0b263b3fddf/xdot-1.1.tar.gz"
   sha256 "e15c53d80dc8777402a7258eebe6cbf395d04085ff9699bbffae91df0ecc2433"
+  revision 1
   head "https://github.com/jrfonseca/xdot.py.git"
 
   bottle do
@@ -17,7 +18,7 @@ class Xdot < Formula
   depends_on "gtk+3"
   depends_on "py3cairo"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "graphviz" do
     url "https://files.pythonhosted.org/packages/9a/00/481ad02701f952c59671a574a808d9d34d200103f0c7396db75f2e3df717/graphviz-0.11.1.zip"
@@ -25,14 +26,14 @@ class Xdot < Formula
   end
 
   def install
-    xy = Language::Python.major_minor_version "python3"
+    xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python#{xy}/site-packages"
     resource("graphviz").stage do
-      system "python3", *Language::Python.setup_install_args(libexec/"vendor")
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
     end
 
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{xy}/site-packages"
-    system "python3", *Language::Python.setup_install_args(libexec)
+    system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec)
 
     bin.install Dir[libexec/"bin/*"]
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])

From 1ac3be279ff019a19b02e47c902483092846b272 Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Fri, 21 Feb 2020 00:48:17 +0000
Subject: [PATCH 56/63] caffe: improve test

Downloading the test file takes ages: it was mirrored on bintray to
speed up the test, which would sometimes hang forever.
---
 Formula/caffe.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/caffe.rb b/Formula/caffe.rb
index d4d0490ddfaec..5d555692bffcf 100644
--- a/Formula/caffe.rb
+++ b/Formula/caffe.rb
@@ -24,7 +24,7 @@ class Caffe < Formula
   depends_on "szip"
 
   resource "test_model_weights" do
-    url "http://dl.caffe.berkeleyvision.org/bvlc_reference_caffenet.caffemodel"
+    url "https://bintray.com/homebrew/mirror/download_file?file_path=bvlc_reference_caffenet.caffemodel"
     sha256 "472d4a06035497b180636d8a82667129960371375bd10fcb6df5c6c7631f25e0"
   end
 

From 41cde5539714f0d311b42a37eec22d87f3f8ab4b Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Sat, 28 Mar 2020 12:00:27 +0100
Subject: [PATCH 57/63] pcl: revision bump for python@3.8

---
 Formula/pcl.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/pcl.rb b/Formula/pcl.rb
index 33673c2c81f22..6478ed853d913 100644
--- a/Formula/pcl.rb
+++ b/Formula/pcl.rb
@@ -3,7 +3,7 @@ class Pcl < Formula
   homepage "http://www.pointclouds.org/"
   url "https://github.com/PointCloudLibrary/pcl/archive/pcl-1.9.1.tar.gz"
   sha256 "0add34d53cd27f8c468a59b8e931a636ad3174b60581c0387abb98a9fc9cddb6"
-  revision 6
+  revision 7
   head "https://github.com/PointCloudLibrary/pcl.git"
 
   bottle do

From 64dbb34fd5e651df496c9645792e680b099f2b41 Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Sat, 28 Mar 2020 14:20:35 +0100
Subject: [PATCH 58/63] glib: revision bump for python@3.8

---
 Formula/glib.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Formula/glib.rb b/Formula/glib.rb
index fe56e25000324..90ffc72c64eeb 100644
--- a/Formula/glib.rb
+++ b/Formula/glib.rb
@@ -3,6 +3,7 @@ class Glib < Formula
   homepage "https://developer.gnome.org/glib/"
   url "https://download.gnome.org/sources/glib/2.64/glib-2.64.1.tar.xz"
   sha256 "17967603bcb44b6dbaac47988d80c29a3d28519210b28157c2bd10997595bbc7"
+  revision 1
 
   bottle do
     sha256 "95aad8af50c0e84cc271b7843e0ef35a0c94fe96a1f1c721d5cb20674ccb7537" => :catalina
@@ -16,7 +17,8 @@ class Glib < Formula
   depends_on "gettext"
   depends_on "libffi"
   depends_on "pcre"
-  depends_on "python"
+  depends_on "python@3.8"
+
   uses_from_macos "util-linux" # for libmount.so
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=673135 Resolved as wontfix,
@@ -28,6 +30,8 @@ class Glib < Formula
   end
 
   def install
+    Language::Python.rewrite_python_shebang(Formula["python@3.8"].opt_bin/"python3")
+
     inreplace %w[gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gutils.c],
       "@@HOMEBREW_PREFIX@@", HOMEBREW_PREFIX
 
@@ -42,6 +46,8 @@ def install
     mkdir "build" do
       system "meson", "--prefix=#{prefix}", *args, ".."
       system "ninja", "-v"
+      # Some files have been generated with a Python shebang, rewrite these too
+      Language::Python.rewrite_python_shebang(Formula["python@3.8"].opt_bin/"python3")
       system "ninja", "install", "-v"
     end
 

From 407d3738505ee7edd09bd530ef1c8c3fdab453ee Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Sat, 28 Mar 2020 14:21:51 +0100
Subject: [PATCH 59/63] meson: revision bump for python@3.8

---
 Formula/meson.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Formula/meson.rb b/Formula/meson.rb
index b027b62d81156..34b9c219a93b8 100644
--- a/Formula/meson.rb
+++ b/Formula/meson.rb
@@ -3,6 +3,7 @@ class Meson < Formula
   homepage "https://mesonbuild.com/"
   url "https://github.com/mesonbuild/meson/releases/download/0.54.0/meson-0.54.0.tar.gz"
   sha256 "dde5726d778112acbd4a67bb3633ab2ee75d33d1e879a6283a7b4a44c3363c27"
+  revision 1
   head "https://github.com/mesonbuild/meson.git"
 
   bottle do
@@ -13,13 +14,13 @@ class Meson < Formula
   end
 
   depends_on "ninja"
-  depends_on "python"
+  depends_on "python@3.8"
 
   def install
-    version = Language::Python.major_minor_version("python3")
+    version = Language::Python.major_minor_version Formula["python@3.8"].bin/"python3"
     ENV["PYTHONPATH"] = lib/"python#{version}/site-packages"
 
-    system "python3", *Language::Python.setup_install_args(prefix)
+    system Formula["python@3.8"].bin/"python3", *Language::Python.setup_install_args(prefix)
 
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end

From 96cdb20a84acc2d22082b10d4ee54ff7ded7a8db Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Sat, 28 Mar 2020 14:22:18 +0100
Subject: [PATCH 60/63] cairo: revision bump for python@3.8

---
 Formula/cairo.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/cairo.rb b/Formula/cairo.rb
index 47076c7022e54..6bcd08eeb20c1 100644
--- a/Formula/cairo.rb
+++ b/Formula/cairo.rb
@@ -3,7 +3,7 @@ class Cairo < Formula
   homepage "https://cairographics.org/"
   url "https://cairographics.org/releases/cairo-1.16.0.tar.xz"
   sha256 "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"
-  revision 2
+  revision 3
 
   bottle do
     sha256 "5fb8b876c66a0b1aaa7f3faedde3803ff4de43c0f5f9244c7d433b43ead1196c" => :catalina

From ee5c8084af75cf556a0eb2c95883db2c726ef912 Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Mon, 30 Mar 2020 13:15:34 +0200
Subject: [PATCH 61/63] zim: revision bump for python@3.8

---
 Formula/zim.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Formula/zim.rb b/Formula/zim.rb
index 680bec931a1c8..a9edae3f0e9b0 100644
--- a/Formula/zim.rb
+++ b/Formula/zim.rb
@@ -3,6 +3,7 @@ class Zim < Formula
   homepage "https://zim-wiki.org/"
   url "https://github.com/jaap-karssenberg/zim-desktop-wiki/archive/0.72.1.tar.gz"
   sha256 "ba02e418b4fb1d7847f96b49ada8c917c881a28bb5fb55dcdca54be7b3fd196a"
+  revision 1
   head "https://github.com/jaap-karssenberg/zim-desktop-wiki.git"
 
   bottle do
@@ -19,7 +20,7 @@ class Zim < Formula
   depends_on "gtk+3"
   depends_on "gtksourceview3"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "pyxdg" do
     url "https://files.pythonhosted.org/packages/47/6e/311d5f22e2b76381719b5d0c6e9dc39cd33999adae67db71d7279a6d70f4/pyxdg-0.26.tar.gz"
@@ -27,13 +28,14 @@ class Zim < Formula
   end
 
   def install
-    ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python3.7/site-packages"
+    python_version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3"
+    ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{python_version}/site-packages"
     resource("pyxdg").stage do
-      system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor")
     end
     ENV["XDG_DATA_DIRS"] = libexec/"share"
-    ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python3.7/site-packages"
-    system "python3", "./setup.py", "install", "--prefix=#{libexec}"
+    ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{python_version}/site-packages"
+    system Formula["python@3.8"].opt_bin/"python3", "./setup.py", "install", "--prefix=#{libexec}"
     bin.install Dir[libexec/"bin/*"]
     bin.env_script_all_files libexec/"bin",
       :PYTHONPATH    => ENV["PYTHONPATH"],

From 7f06170e0da8fea3811c0bad657a16d4db6d7441 Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Mon, 30 Mar 2020 13:18:14 +0200
Subject: [PATCH 62/63] pympress: revision bump for python@3.8

---
 Formula/pympress.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Formula/pympress.rb b/Formula/pympress.rb
index c4c2f0ec10345..85d2d5c966c85 100644
--- a/Formula/pympress.rb
+++ b/Formula/pympress.rb
@@ -5,6 +5,7 @@ class Pympress < Formula
   homepage "https://github.com/Cimbali/pympress/"
   url "https://files.pythonhosted.org/packages/d1/cf/a81c579fa9b65daa7b159220038adaaeb144d21616dc83868ed7c42589d9/pympress-1.5.2.tar.gz"
   sha256 "3f19236897ba7b3106b0b8ccd04ca32aee42fe3a604ea1d7ced305abcceeecf2"
+  revision 1
   head "https://github.com/Cimbali/pympress.git"
 
   bottle do
@@ -18,7 +19,7 @@ class Pympress < Formula
   depends_on "gtk+3"
   depends_on "poppler"
   depends_on "pygobject3"
-  depends_on "python"
+  depends_on "python@3.8"
 
   resource "argh" do
     url "https://files.pythonhosted.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15/argh-0.26.2.tar.gz"

From 9f2dc97764a84080474db94e449ff9b66c78740a Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Mon, 30 Mar 2020 23:02:36 +0200
Subject: [PATCH 63/63] visp: revision bump for python@3.8

---
 Formula/visp.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/visp.rb b/Formula/visp.rb
index b83047c861b6d..0b28e60888325 100644
--- a/Formula/visp.rb
+++ b/Formula/visp.rb
@@ -3,7 +3,7 @@ class Visp < Formula
   homepage "https://visp.inria.fr/"
   url "https://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.3.0.tar.gz"
   sha256 "f2ed11f8fee52c89487e6e24ba6a31fa604b326e08fb0f561a22c877ebdb640d"
-  revision 2
+  revision 3
 
   bottle do
     sha256 "98a4bd39c93b0f398a20064073126b8231beaf72826a9ca5b447e1cca3cd90c0" => :catalina