Content-Length: 10738 | pFad | http://github.com/gitpython-developers/GitPython/pull/1814.patch

thub.com From 73ebcfa54d923503d88078118c5b479c45920205 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Sun, 28 Jan 2024 09:33:31 +0800 Subject: [PATCH 1/2] Use Python 3.8 on Cygwin CI This uses Python 3.8.16 (provided by the Cygwin package python38 at version 3.8.16-1), to work around the problem that pip has begun to block on some PyPI package downloads when Python 3.9.18 (provided by the Cygwin package python39 at version 3.9.18-1) is used. I also tried a bunch of other stuff, which is listed below and can be examined in full detail, with all individual diffs and most CI results, at https://github.com/EliahKagan/GitPython/pull/2. * Try not installing/upgrading wheel for Cygwin CI This is for a recent problem where "pip install -U" in the virtual environment in a Cygwin test job seems to block indefinitely on downloading the wheel package itself (not other packages' wheels). * Try not upgrading/installing pip/setuptools either on Cygwin * Try installing pytho39-wheel Cygwin package Maybe this will overcome the next blockage, which is the codecov PyPI package, downloading a .tar.gz file. * Try upgrading wheel, but after upgrading pip * Try always running pip on Cygwin as "python -m pip" * Try using a venv on Cygwin * Use "python -v -m pip" to see some of what's going on * Undo venv; use "python -m pip -vvv" to see what's going on * Undo all debugging changes except passing "-vvv" * Try with "--no-cache-dir" * Try with different tmp dir for pip runs * Try with python39=3.9.16-1 * Try not upgrading setuptools * Try not installing Cygwin python39-pip package * Run pip freeze effectively This doesn't fix the bigger issue, it just addresses something from the last commit. * Try not installing python39-virtualenv either * Try giving IPv4 for files.pythonhosted.org in hosts file * Try downloading wheel with wget This is not a usable solution, but it is useful for troubleshooting. * Try with python39-pip=23.0.1-1 And don't upgrade it or other PyPI packages. * Pin pip with pip (Cygwin package doesn't pin) This tries with an older pip, but if the problem is the build rather than the version, then it would also help. * Stop pinning; keep skipping -U for PyPA; instrument with -vvv This won't fix it but is diagnostic, to reveal the URL for the coverage package, so I can see what happens when that is installed more manually. * Try installing coverage[toml] separately * Unset -vvv to see the bigger picture more easily * Try killing pip after a timeout and rerunning it * Use SIGKILL * Increase timeout from 70 to 120 seconds per try * Give each try a little more time than the last Since it has to verify previous work. * Tweak (re)try parameters * Try Python 3.8 --- .github/workflows/cygwin-test.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cygwin-test.yml b/.github/workflows/cygwin-test.yml index f3937d21e..84a7f6490 100644 --- a/.github/workflows/cygwin-test.yml +++ b/.github/workflows/cygwin-test.yml @@ -30,7 +30,7 @@ jobs: - name: Install Cygwin uses: cygwin/cygwin-install-action@v4 with: - packages: python39 python39-pip python39-virtualenv git + packages: python38 python38-pip python38-virtualenv git add-to-path: false # No need to change $PATH outside the Cygwin environment. - name: Arrange for verbose output @@ -55,28 +55,23 @@ jobs: # and cause subsequent tests to fail cat test/fixtures/.gitconfig >> ~/.gitconfig - - name: Ensure the "pip" command is available - run: | - # This is used unless, and before, an updated pip is installed. - ln -s pip3 /usr/bin/pip - - name: Update PyPA packages run: | - # Get the latest pip, wheel, and prior to Python 3.12, setuptools. - python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel + # Get the latest pip, setuptools, and wheel. + python3.8 -m pip install -U pip setuptools wheel - name: Install project and test dependencies run: | - pip install ".[test]" + python3.8 -m pip install ".[test]" - name: Show version and platform information run: | uname -a - command -v git python + command -v git python3.8 git version - python --version - python -c 'import os, sys; print(f"sys.platform={sys.platform!r}, os.name={os.name!r}")' + python3.8 --version + python3.8 -c 'import os, sys; print(f"sys.platform={sys.platform!r}, os.name={os.name!r}")' - name: Test with pytest run: | - pytest --color=yes -p no:sugar --instafail -vv + python3.8 -m pytest --color=yes -p no:sugar --instafail -vv From 8dc4cb02b5b9d01bd720dc46a9a847bdb906eae0 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Sun, 28 Jan 2024 10:07:46 +0800 Subject: [PATCH 2/2] Use Python 3.9.16 on Cygwin CI The latest currently packaged version of Python 3.9 for Cygwin is 3.9.18 (provided by the Cygwin package python39 at version 3.9.18-1). That version, at least as we are using it, has a problem where pip has begun to block on some PyPI package downloads. In 73ebcfa (EliahKagan#2), I worked around this problem by downgrading the minor version of Python to 3.8. But it is better to use 3.9 if we can, since it is currently the latest minor version of Python in the Cygwin repositories, and also because (relating to that) it is used more often, and thus probably used more often with GitPython, than 3.8. This upgrades Python on Cygwin but not all the way. It upgrades it to the latest (or latest currently available) patch version of 3.9 packaged for Cygwin of those that strictly precede 3.9.18 where the problem occurs. That version is 3.9.16, provided by the Cygwin package python39 at version 3.9.16-1. This version may eventually no longer be available for download from Cygwin's repositories, so hopefully a real solution or better workaround will be found by then, or perhaps a future update to the package itself will fix the problem. I also tried some more other stuff since finding 3.8 to work in 73ebcfa. Changes since then are listed below. They can be examined in full detail, with individual diffs and CI results, at https://github.com/EliahKagan/GitPython/pull/3. * Try Python 3.9 with other details the same Changing it to Python 3.8 worked, but I want to check that it was actually the use of Python 3.8, rather than other seemingly small changes made to support using Python 3.8, that made the difference. * Revert "Try Python 3.9 with other details the same" This reverts commit b55cbfbb31376e9da4ba6a64ac11cd791718ff8d. * Try 3.9 again, with both python39=3.9.16-1 python39-pip=23.0.1-1 * Back to 3.8; try another GitHub Action Python 3.8 worked with cygwin-install-action, but I want to make the change to setup-cygwin by itself first before trying it with 3.9, in case I am using setup-cygwin incorrectly. * Try 3.9 with this setup-cygwin action * Try pinning with setup-cygwin * Try not pinning, but no -U for PyPA, with setup-cygwin Pinning and skipping -U for PyPA packages worked. Let's see if it was really pinning that made the difference. * Try pinning just python39-pip Pinning works, and merely omitting the -U for PyPA package doesn't. Examining the output of runs that used install-cygwin-action and attemped pinning Cygwin package versions shows newer versions were installed, whereas pinning is really happening with setup-cygwin. This tries pinning just the Cygwin package for pip, rather than for Python 3.9. I don't expect this to work. * Try pinning just python39=3.9.16-1 And not pip, but this does not add back the -U for PyPA yet. * Add back -U for PyPA packages * Try pinning python39=3.9.16-1 with old action/everything This is extremely unlikely to work, I just want to check. * Try just setup-cygwin and pinning python39=3.9.16-1 That is, this puts back all the other stuff the way it was on the main branch when the breakage occurred, besides changing from cygwin-install-action to setup-cygwin to make pinning work and using it to get version 3.9.16-1 of the Cygwin python39 package. --- .github/workflows/cygwin-test.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cygwin-test.yml b/.github/workflows/cygwin-test.yml index 84a7f6490..61e6a3089 100644 --- a/.github/workflows/cygwin-test.yml +++ b/.github/workflows/cygwin-test.yml @@ -15,7 +15,7 @@ jobs: defaults: run: - shell: C:\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr "{0}" + shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr "{0}" steps: - name: Force LF line endings @@ -27,11 +27,10 @@ jobs: with: fetch-depth: 0 - - name: Install Cygwin - uses: cygwin/cygwin-install-action@v4 + - name: Set up Cygwin + uses: egor-tensin/setup-cygwin@v4 with: - packages: python38 python38-pip python38-virtualenv git - add-to-path: false # No need to change $PATH outside the Cygwin environment. + packages: python39=3.9.16-1 python39-pip python39-virtualenv git - name: Arrange for verbose output run: | @@ -55,23 +54,28 @@ jobs: # and cause subsequent tests to fail cat test/fixtures/.gitconfig >> ~/.gitconfig + - name: Ensure the "pip" command is available + run: | + # This is used unless, and before, an updated pip is installed. + ln -s pip3 /usr/bin/pip + - name: Update PyPA packages run: | - # Get the latest pip, setuptools, and wheel. - python3.8 -m pip install -U pip setuptools wheel + # Get the latest pip, wheel, and prior to Python 3.12, setuptools. + python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel - name: Install project and test dependencies run: | - python3.8 -m pip install ".[test]" + pip install ".[test]" - name: Show version and platform information run: | uname -a - command -v git python3.8 + command -v git python git version - python3.8 --version - python3.8 -c 'import os, sys; print(f"sys.platform={sys.platform!r}, os.name={os.name!r}")' + python --version + python -c 'import os, sys; print(f"sys.platform={sys.platform!r}, os.name={os.name!r}")' - name: Test with pytest run: | - python3.8 -m pytest --color=yes -p no:sugar --instafail -vv + pytest --color=yes -p no:sugar --instafail -vv

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!