Merge pull request #8395 from ThomasWaldmann/msys-updates

msys2: disable SETUPTOOLS_USE_DISTUTILS=stdlib hack
borgbackup · Sep 19, 2024 · 8d37c00 · 8d37c00
2 parents 11b72ef + 4c1a0b1
commit 8d37c00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -202,7 +202,8 @@ jobs:
     needs: linux
 
     env:
-      SETUPTOOLS_USE_DISTUTILS: stdlib # Needed for pip to work - https://www.msys2.org/docs/python/#known-issues
+      # Needed for setuptools < 70.2.0 to work, see: https://www.msys2.org/docs/python/#known-issues
+      # SETUPTOOLS_USE_DISTUTILS: stdlib
       PY_COLORS: 1
 
     defaults:
@@ -222,10 +223,10 @@ jobs:
       - name: Build
         run: |
           # build borg.exe
-          SETUPTOOLS_USE_DISTUTILS=stdlib pip install -e .
+          pip install -e .
           pyinstaller -y scripts/borg.exe.spec
           # build sdist and wheel in dist/...
-          SETUPTOOLS_USE_DISTUTILS=stdlib python -m build
+          python -m build
       - uses: actions/upload-artifact@v4
         with:
           name: borg-windows

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -350,7 +350,8 @@ Ensure to install the dependencies as described within :ref:`Dependencies: Windo
 
 ::
 
-    export SETUPTOOLS_USE_DISTUTILS=stdlib # Needed for pip to work - https://www.msys2.org/docs/python/#known-issues
+    # Needed for setuptools < 70.2.0 to work - https://www.msys2.org/docs/python/#known-issues
+    # export SETUPTOOLS_USE_DISTUTILS=stdlib
     pip install -e .
     pyinstaller -y scripts/borg.exe.spec