Merge pull request #2053 from EliahKagan/cygwin-wheel-packages · gitpython-developers/GitPython@46c439b · GitHub

gitpython-developers / GitPython Public

• Notifications You must be signed in to change notification settings
• Fork 989
• Star 5.2k

• Code
• Issues 8
• Pull requests 2
• Discussions
• Actions
• Security and quality 34
• Insights

Additional navigation options

Commit 46c439b

Browse filesBrowse the repository at this point in the historyBrowse files

EliahKagan

authored

Merge pull request #2053 from EliahKagan/cygwin-wheel-packages

Fix Cygwin installation on CI for `pip`

2 parents d885bea + 8e24edf commit 46c439b
Copy full SHA for 46c439b

4 files changed

+7-22Lines changed: 7 additions & 22 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • alpine-test.yml
  • cygwin-test.yml
  • pythonpackage.yml
• test
  • test_installation.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/alpine-test.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/alpine-test.yml

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -47,13 +47,12 @@ jobs:
47	47	# and cause subsequent tests to fail
48	48	cat test/fixtures/.gitconfig >> ~/.gitconfig
49	49
50		- - name: Set up virtualenv
	50	+ - name: Set up virtual environment
51	51	run: |
52	52	python -m venv .venv
53	53
54	54	- name: Update PyPA packages
55	55	run: |
56		- # Get the latest pip, wheel, and prior to Python 3.12, setuptools.
57	56	. .venv/bin/activate
58	57	python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel
59	58

Collapse file

‎.github/workflows/cygwin-test.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/cygwin-test.yml

+6-11Lines changed: 6 additions & 11 deletions

Original file line number	Diff line number	Diff line change
@@ -7,8 +7,6 @@ permissions:
7	7
8	8	jobs:
9	9	test:
10		- runs-on: windows-latest
11		-
12	10	strategy:
13	11	matrix:
14	12	selection: [fast, perf]
@@ -20,6 +18,8 @@ jobs:
20	18
21	19	fail-fast: false
22	20
	21	+ runs-on: windows-latest
	22	+
23	23	env:
24	24	CHERE_INVOKING: "1"
25	25	CYGWIN_NOWINPATH: "1"
@@ -32,7 +32,7 @@ jobs:
32	32	- name: Force LF line endings
33	33	run: |
34	34	git config --global core.autocrlf false # Affects the non-Cygwin git.
35		- shell: bash # Use Git Bash instead of Cygwin Bash for this step.
	35	+ shell: pwsh # Do this outside Cygwin, to affect actions/checkout.
36	36
37	37	- uses: actions/checkout@v4
38	38	with:
@@ -41,7 +41,7 @@ jobs:
41	41	- name: Install Cygwin
42	42	uses: cygwin/cygwin-install-action@v5
43	43	with:
44		- packages: python39 python39-pip python39-virtualenv git wget
	44	+ packages: git python39 python-pip-wheel python-setuptools-wheel python-wheel-wheel
45	45	add-to-path: false # No need to change $PATH outside the Cygwin environment.
46	46
47	47	- name: Arrange for verbose output
@@ -67,18 +67,13 @@ jobs:
67	67	# and cause subsequent tests to fail
68	68	cat test/fixtures/.gitconfig >> ~/.gitconfig
69	69
70		- - name: Set up virtualenv
	70	+ - name: Set up virtual environment
71	71	run: |
72		- python3.9 -m venv --without-pip .venv
	72	+ python3.9 -m venv .venv
73	73	echo 'BASH_ENV=.venv/bin/activate' >>"$GITHUB_ENV"
74	74
75		- - name: Bootstrap pip in virtualenv
76		- run: |
77		- wget -qO- https://bootstrap.pypa.io/get-pip.py | python
78		-
79	75	- name: Update PyPA packages
80	76	run: |
81		- # Get the latest pip, wheel, and prior to Python 3.12, setuptools.
82	77	python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel
83	78
84	79	- name: Install project and test dependencies

Collapse file

‎.github/workflows/pythonpackage.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/pythonpackage.yml

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -71,7 +71,6 @@ jobs:
71	71
72	72	- name: Update PyPA packages
73	73	run: |
74		- # Get the latest pip, wheel, and prior to Python 3.12, setuptools.
75	74	python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel
76	75
77	76	- name: Install project and test dependencies

Collapse file

‎test/test_installation.py‎

Copy file name to clipboardExpand all lines: test/test_installation.py

-8Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -4,19 +4,11 @@
4	4	import ast
5	5	import os
6	6	import subprocess
7		- import sys
8		-
9		- import pytest
10	7
11	8	from test.lib import TestBase, VirtualEnvironment, with_rw_directory
12	9
13	10
14	11	class TestInstallation(TestBase):
15		- @pytest.mark.xfail(
16		- sys.platform == "cygwin" and "CI" in os.environ,
17		- reason="Trouble with pip on Cygwin CI, see issue #2004",
18		- raises=subprocess.CalledProcessError,
19		- )
20	12	@with_rw_directory
21	13	def test_installation(self, rw_dir):
22	14	venv = self._set_up_venv(rw_dir)

0 commit comments

Comments

0 (0)