Snowflake-cli formula python 3.12 fix

snowflakedb · Feb 26, 2024 · 1778de2 · 1778de2
1 parent 958333a
commit 1778de2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/Formula/snowflake-cli.rb b/Formula/snowflake-cli.rb
@@ -9,12 +9,11 @@ class SnowflakeCli < Formula
 
     def install
       ENV["CARGO_NET_GIT_FETCH_WITH_CLI"] = "true"
-      #without_pip=false because of https://github.com/Homebrew/brew/pull/15792
-      venv = virtualenv_create(libexec, "python3", system_site_packages: false, without_pip: false)
+      venv = virtualenv_create(libexec, "python3", system_site_packages: false)
       venv.instance_variable_get(:@formula).system venv.instance_variable_get(:@venv_root)/"bin/python",
-        "-m", "pip", "install", "pip==22.3.1"
-      venv.instance_variable_get(:@formula).system venv.instance_variable_get(:@venv_root)/"bin/pip",
-        "install", "snowflake-cli-labs==2.0.0"
+        "-m", "ensurepip", "--upgrade"
+      venv.instance_variable_get(:@formula).system venv.instance_variable_get(:@venv_root)/"bin/python",
+        "-m", "pip", "install", "snowflake-cli-labs==2.0.0"
       bin.install_symlink "#{libexec}/bin/snow" => "snow"
     end
 

diff --git a/Formula/snowflake-cli.tmpl.rb b/Formula/snowflake-cli.tmpl.rb
@@ -9,12 +9,11 @@ class SnowflakeCli < Formula
 
     def install
       ENV["CARGO_NET_GIT_FETCH_WITH_CLI"] = "true"
-      #without_pip=false because of https://github.com/Homebrew/brew/pull/15792
-      venv = virtualenv_create(libexec, "python3", system_site_packages: false, without_pip: false)
+      venv = virtualenv_create(libexec, "python3", system_site_packages: false)
       venv.instance_variable_get(:@formula).system venv.instance_variable_get(:@venv_root)/"bin/python",
-        "-m", "pip", "install", "pip==22.3.1"
-      venv.instance_variable_get(:@formula).system venv.instance_variable_get(:@venv_root)/"bin/pip",
-        "install", "snowflake-cli-labs=={{ version }}"
+        "-m", "ensurepip", "--upgrade"
+      venv.instance_variable_get(:@formula).system venv.instance_variable_get(:@venv_root)/"bin/python",
+        "-m", "pip", "install", "snowflake-cli-labs=={{ version }}"
       bin.install_symlink "#{libexec}/bin/snow" => "snow"
     end