Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configuration files may now also be stored under sys.prefix #6268

Merged
merged 8 commits into from
Mar 7, 2019
Merged

Configuration files may now also be stored under sys.prefix #6268

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79a7028
Fixes #5060: Configuration files may now also be stored under `sys.pr…
zooba Feb 15, 2019
ffac445
Fix tests that passed against environment pip
zooba Feb 15, 2019
bcb9797
Make sys.prefix configuration lower-priority for 'pip config set'
zooba Feb 15, 2019
24cf5e7
Use venv configuration set for site settings even outside of a virtua…
zooba Feb 16, 2019
a3852be
Remove now unnecessary monkeypatching in test
zooba Feb 16, 2019
3a408e7
Rename kinds.VENV to kinds.SITE and site_config_files to global_confi…
zooba Feb 20, 2019
571e388
Add tests for config file options
zooba Feb 22, 2019
28d4170
Switch to proper deprecation warning.
zooba Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/5060.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Configuration files may now also be stored under ``sys.prefix``
5 changes: 5 additions & 0 deletions src/pip/_internal/utils/appdirs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@ def site_config_dirs(appname):
# always look in /etc directly as well
pathlist.append('/etc')

# allow configuration in sys.prefix without any appname
# but put it first so that it is not preferred for "pip config set"
# see <https://github.com/pypa/pip/issues/5060>
pathlist.insert(0, sys.prefix)
pradyunsg marked this conversation as resolved.
Show resolved Hide resolved

return pathlist


Expand Down
11 changes: 7 additions & 4 deletions tests/unit/test_appdirs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ def _get_win_folder(base):
monkeypatch.setattr(appdirs, "WINDOWS", True)
monkeypatch.setattr(os, "path", ntpath)

assert appdirs.site_config_dirs("pip") == ["C:\\ProgramData\\pip"]
assert appdirs.site_config_dirs("pip") == [sys.prefix,
"C:\\ProgramData\\pip"]
assert _get_win_folder.calls == [pretend.call("CSIDL_COMMON_APPDATA")]

def test_site_config_dirs_osx(self, monkeypatch):
Expand All @@ -110,7 +111,7 @@ def test_site_config_dirs_osx(self, monkeypatch):
monkeypatch.setattr(sys, "platform", "darwin")

assert appdirs.site_config_dirs("pip") == \
["/Library/Application Support/pip"]
[sys.prefix, "/Library/Application Support/pip"]

def test_site_config_dirs_linux(self, monkeypatch):
monkeypatch.setattr(appdirs, "WINDOWS", False)
Expand All @@ -119,8 +120,9 @@ def test_site_config_dirs_linux(self, monkeypatch):
monkeypatch.setattr(sys, "platform", "linux2")

assert appdirs.site_config_dirs("pip") == [
sys.prefix,
'/etc/xdg/pip',
'/etc'
'/etc',
]

def test_site_config_dirs_linux_override(self, monkeypatch):
Expand All @@ -131,10 +133,11 @@ def test_site_config_dirs_linux_override(self, monkeypatch):
monkeypatch.setattr(sys, "platform", "linux2")

assert appdirs.site_config_dirs("pip") == [
sys.prefix,
'/spam/pip',
'/etc/pip',
'/etc/xdg/pip',
'/etc'
'/etc',
]


Expand Down