From 6f809a0741386fad5146d63c656049d1473cc5c7 Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 17 Feb 2025 14:09:45 +0000 Subject: [PATCH 1/4] Attempt to solve problems with cygwin in the CI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef175cb8d7..7dfb5a507b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -196,8 +196,8 @@ jobs: - name: Run tests shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} run: | - git config --global --add safe.directory "$(cygpath -u "$GITHUB_WORKSPACE")" # workaround for #3408 - tox + git config --global --add safe.directory "$(cygpath -u "${{ github.workspace }}")" # workaround for #3408 + python -m tox - name: Create coverage report if: hashFiles('.coverage') != '' # Rudimentary `file.exists()` run: | From 94a84c2f90f2c36b9f8ec3631ed7cba80b6fad7c Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 17 Feb 2025 14:19:22 +0000 Subject: [PATCH 2/4] Add command for debugging purposes --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7dfb5a507b..f16d866f90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -197,6 +197,7 @@ jobs: shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} run: | git config --global --add safe.directory "$(cygpath -u "${{ github.workspace }}")" # workaround for #3408 + echo "$(cygpath -u "${{ github.workspace }}")" # for debugging purposes python -m tox - name: Create coverage report if: hashFiles('.coverage') != '' # Rudimentary `file.exists()` From 32332e4728f46e9e37b1c775bbcc6c4ade282ed0 Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 17 Feb 2025 14:27:17 +0000 Subject: [PATCH 3/4] Attempt to install missing dependencies --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f16d866f90..16eefcdc93 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -182,6 +182,7 @@ jobs: packages: >- python${{ matrix.python }}, python${{ matrix.python }}-devel, + python${{ matrix.python }}-pip, python${{ matrix.python }}-tox, gcc-core, git, @@ -193,6 +194,11 @@ jobs: run: | python -c 'import platform; print("python-version=" + platform.python_version())' >> ${GITHUB_OUTPUT} shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} + - name: Install missing dependencies + shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} + run: | + # Workaround for https://github.com/pypa/setuptools/issues/4831 + python -m pip check | sed -rn 's/.*requires ([^,]+),.*/\1/p' | xargs python -m pip install - name: Run tests shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} run: | From 9d6ade8c85fa799700bdcdf4572cbc2755a1732e Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 17 Feb 2025 14:47:37 +0000 Subject: [PATCH 4/4] Try to install tox using 'pip' on cygwin --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16eefcdc93..b77ba8f70c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -183,7 +183,6 @@ jobs: python${{ matrix.python }}, python${{ matrix.python }}-devel, python${{ matrix.python }}-pip, - python${{ matrix.python }}-tox, gcc-core, git, - name: Record the currently selected Python version @@ -194,11 +193,11 @@ jobs: run: | python -c 'import platform; print("python-version=" + platform.python_version())' >> ${GITHUB_OUTPUT} shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} - - name: Install missing dependencies + - name: Install tox using pip shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} run: | # Workaround for https://github.com/pypa/setuptools/issues/4831 - python -m pip check | sed -rn 's/.*requires ([^,]+),.*/\1/p' | xargs python -m pip install + python -m pip install tox - name: Run tests shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0} run: |