Merge pull request #7 from kbayliss/fix/6-without-pip

Exclude `without_pip` when using python3.12+
torchbox · Nov 20, 2024 · 42d3476 · 42d3476
2 parents 6109bb4 + ca1eb8e
commit 42d3476
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,10 +20,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install custom tap
+    - name: Set up Homebrew
+      uses: Homebrew/actions/setup-homebrew@master
+    - name: Add our custom tap
       run: |
-        mkdir -p /usr/local/Homebrew/Library/Taps/$GITHUB_REPOSITORY
-        cp -r * /usr/local/Homebrew/Library/Taps/$GITHUB_REPOSITORY/
+        ln -s "$(pwd)" "$(brew --repository)/Library/Taps/$GITHUB_REPOSITORY"
     - name: Install ${{ matrix.formula }}
       run: brew install $GITHUB_REPOSITORY/${{ matrix.formula }}
     - name: Test ${{ matrix.formula }}

diff --git a/Formula/buckup.rb b/Formula/buckup.rb
@@ -10,9 +10,15 @@ class Buckup < Formula
   depends_on "python@3"
 
   def install
-    venv = virtualenv_create(libexec, "python3", without_pip: false)
-    system libexec/"bin/pip", "install", buildpath
-    system libexec/"bin/pip", "uninstall", "-y", "buckup"
+    # without_pip is deprecated in python 3.12+, so we only pass it for older versions
+    if Language::Python.major_minor_version("python3") >= "3.12"
+      venv = virtualenv_create(libexec, "python3")
+      system libexec/"bin/python", "-m", "ensurepip"
+    else
+      venv = virtualenv_create(libexec, "python3", without_pip: false)
+    end
+    system libexec/"bin/python", "-m", "pip", "install", buildpath
+    system libexec/"bin/python", "-m", "pip", "uninstall", "-y", "buckup"
     venv.pip_install_and_link buildpath
   end
 

diff --git a/Formula/heroku-audit.rb b/Formula/heroku-audit.rb
@@ -10,9 +10,15 @@ class HerokuAudit < Formula
   depends_on "python@3"
 
   def install
-    venv = virtualenv_create(libexec, "python3", without_pip: false)
-    system libexec/"bin/pip", "install", buildpath
-    system libexec/"bin/pip", "uninstall", "-y", "heroku-audit"
+    # without_pip is deprecated in python 3.12+, so we only pass it for older versions
+    if Language::Python.major_minor_version("python3") >= "3.12"
+      venv = virtualenv_create(libexec, "python3")
+      system libexec/"bin/python", "-m", "ensurepip"
+    else
+      venv = virtualenv_create(libexec, "python3", without_pip: false)
+    end
+    system libexec/"bin/python", "-m", "pip", "install", buildpath
+    system libexec/"bin/python", "-m", "pip", "uninstall", "-y", "heroku-audit"
     venv.pip_install_and_link buildpath
   end