Add option to install python-setuptools #699
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bastelfreak
force-pushed
the
arch2
branch
2 times, most recently
from
d510419
to
da45f01
Compare
sebastianrakel
approved these changes
Aug 21, 2024
This is required at least on Arch Linux because distutils is provided by python-setuptools, not python: https://gitlab.archlinux.org/archlinux/packaging/packages/thefuck/-/issues/1
kenyon
reviewed
Aug 21, 2024
| @@ -61,6 +62,7 @@ | |||
| Stdlib::Absolutepath $anaconda_install_path = '/opt/python', | |||
| Boolean $manage_scl = true, | |||
| Optional[Python::Umask] $umask = undef, | |||
| Boolean $manage_setuptools = $facts['os']['family'] ? { 'Archlinux' => true, default => false, }, | |||
There was a problem hiding this comment.
Could also just do
Suggested change
| Boolean $manage_setuptools = $facts['os']['family'] ? { 'Archlinux' => true, default => false, }, | |
| Boolean $manage_setuptools = $facts['os']['family'] == 'Archlinux', |
| @@ -19,8 +19,10 @@ | |||
|
|
|||
| if facts[:os]['family'] == 'Archlinux' | |||
| it { is_expected.not_to contain_package('pip') } | |||
| it { is_expected.to contain_package('python-setuptools') } | |||
There was a problem hiding this comment.
Suggested change
| it { is_expected.to contain_package('python-setuptools') } | |
| it { is_expected.to contain_package('python-distutils-extra') } |
| else | ||
| it { is_expected.to contain_package('pip') } | ||
| it { is_expected.not_to contain_package('python-setuptools') } |
There was a problem hiding this comment.
Suggested change
| it { is_expected.not_to contain_package('python-setuptools') } | |
| it { is_expected.not_to contain_package('python-distutils-extra') } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is required at least on Arch Linux because distutils is provided by python-setuptools, not python:
https://gitlab.archlinux.org/archlinux/packaging/packages/thefuck/-/issues/1
Pull Request (PR) description
This Pull Request (PR) fixes the following issues