From d3e8ac0843ab966ae6e932fd4b0bdfeb745124cd Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Wed, 12 Jun 2024 15:36:58 -0700 Subject: [PATCH 1/5] Added fix for pip._vendor.distlib issue on windows msys2 Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 693d2aba5..6a5110aad 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -124,6 +124,9 @@ jobs: mingw-w64-x86_64-cmake make git + - name: Ensure MSYS2 pip is updated + if: matrix.python-version == 'mingw64' + run: python -m pip install --upgrade pip - name: Set up Python ${{ matrix.python-version }} if: matrix.python-version != 'mingw64' uses: actions/setup-python@v4.3.0 From 21b958e5aa6902abfe38a656824076e09c06e595 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Wed, 12 Jun 2024 15:46:30 -0700 Subject: [PATCH 2/5] Trying alternate approach to pip update Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6a5110aad..7dd9871d6 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -126,7 +126,7 @@ jobs: git - name: Ensure MSYS2 pip is updated if: matrix.python-version == 'mingw64' - run: python -m pip install --upgrade pip + run: pip install --upgrade pip - name: Set up Python ${{ matrix.python-version }} if: matrix.python-version != 'mingw64' uses: actions/setup-python@v4.3.0 From ed9da0247e26f31216c6ad9378c5f51b0a8468fe Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Wed, 12 Jun 2024 15:51:01 -0700 Subject: [PATCH 3/5] Trying OpenSSL install as a solution Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7dd9871d6..e73293a6a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -118,15 +118,13 @@ jobs: with: msystem: mingw64 install: >- + mingw-w64-x86_64-openssl mingw-w64-x86_64-python mingw-w64-x86_64-python-pip mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake make git - - name: Ensure MSYS2 pip is updated - if: matrix.python-version == 'mingw64' - run: pip install --upgrade pip - name: Set up Python ${{ matrix.python-version }} if: matrix.python-version != 'mingw64' uses: actions/setup-python@v4.3.0 From 7d05bd30a59cd5c9b464aafa027bbd69978f7c10 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Wed, 12 Jun 2024 15:56:56 -0700 Subject: [PATCH 4/5] Trying yet another way of fixing pip installation Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e73293a6a..ce73a6e8d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -118,13 +118,15 @@ jobs: with: msystem: mingw64 install: >- - mingw-w64-x86_64-openssl mingw-w64-x86_64-python mingw-w64-x86_64-python-pip mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake make git + - name: Ensure MSYS2 pip is updated + if: matrix.python-version == 'mingw64' + run: curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python - name: Set up Python ${{ matrix.python-version }} if: matrix.python-version != 'mingw64' uses: actions/setup-python@v4.3.0 From 9f9017858a026ec17958151f6c5032bcf02ec7a4 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Wed, 12 Jun 2024 16:00:12 -0700 Subject: [PATCH 5/5] removed erroneous sudo Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index ce73a6e8d..fe48fac52 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -126,7 +126,7 @@ jobs: git - name: Ensure MSYS2 pip is updated if: matrix.python-version == 'mingw64' - run: curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python + run: curl -sS https://bootstrap.pypa.io/get-pip.py | python - name: Set up Python ${{ matrix.python-version }} if: matrix.python-version != 'mingw64' uses: actions/setup-python@v4.3.0