Commit 82aaa13

authored

Merge pull request #2043 from EliahKagan/static-package-selection

Express conditional `setuptools` requirement statically

2 parents e337e99 + 727f4e9 commit 82aaa13Copy full SHA for 82aaa13

File tree

+16

-10

lines changed

+16

-10

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ jobs:`
`55`	`55`	`run: \|`
`56`	`56`	`# Get the latest pip, wheel, and prior to Python 3.12, setuptools.`
`57`	`57`	`. .venv/bin/activate`
`58`		`- python -m pip install -U pip $(pip freeze --all \| grep -ow ^setuptools) wheel`
	`58`	`+ python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel`
`59`	`59`
`60`	`60`	`- name: Install project and test dependencies`
`61`	`61`	`run: \|`
`62`	`62`	`. .venv/bin/activate`
`63`		`- pip install ".[test]"`
	`63`	`+ pip install '.[test]'`
`64`	`64`
`65`	`65`	`- name: Show version and platform information`
`66`	`66`	`run: \|`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,11 @@ jobs:`
`79`	`79`	`- name: Update PyPA packages`
`80`	`80`	`run: \|`
`81`	`81`	`# Get the latest pip, wheel, and prior to Python 3.12, setuptools.`
`82`		`- python -m pip install -U pip $(pip freeze --all \| grep -ow ^setuptools) wheel`
	`82`	`+ python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel`
`83`	`83`
`84`	`84`	`- name: Install project and test dependencies`
`85`	`85`	`run: \|`
`86`		`- pip install ".[test]"`
	`86`	`+ pip install '.[test]'`
`87`	`87`
`88`	`88`	`- name: Show version and platform information`
`89`	`89`	`run: \|`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ jobs:`
`72`	`72`	`- name: Update PyPA packages`
`73`	`73`	`run: \|`
`74`	`74`	`# Get the latest pip, wheel, and prior to Python 3.12, setuptools.`
`75`		`- python -m pip install -U pip $(pip freeze --all \| grep -ow ^setuptools) wheel`
	`75`	`+ python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel`
`76`	`76`
`77`	`77`	`- name: Install project and test dependencies`
`78`	`78`	`run: \|`
`79`		`- pip install ".[test]"`
	`79`	`+ pip install '.[test]'`
`80`	`80`
`81`	`81`	`- name: Show version and platform information`
`82`	`82`	`run: \|`
`@@ -114,5 +114,5 @@ jobs:`
`114`	`114`	`- name: Documentation`
`115`	`115`	`if: matrix.python-version != '3.7'`
`116`	`116`	`run: \|`
`117`		`- pip install ".[doc]"`
	`117`	`+ pip install '.[doc]'`
`118`	`118`	`make -C doc html`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -415,9 +415,15 @@ def __init__(self, env_dir, *, with_pip):`
`415`	`415`
`416`	`416`	`if with_pip:`
`417`	`417`	`# The upgrade_deps parameter to venv.create is 3.9+ only, so do it this way.`
`418`		`- command = [self.python, "-m", "pip", "install", "--upgrade", "pip"]`
`419`		`- if sys.version_info < (3, 12):`
`420`		`- command.append("setuptools")`
	`418`	`+ command = [`
	`419`	`+ self.python,`
	`420`	`+ "-m",`
	`421`	`+ "pip",`
	`422`	`+ "install",`
	`423`	`+ "--upgrade",`
	`424`	`+ "pip",`
	`425`	`+ 'setuptools; python_version<"3.12"',`
	`426`	`+ ]`
`421`	`427`	`subprocess.check_output(command)`
`422`	`428`
`423`	`429`	`@property`

Comments

(0)