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.

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

Revert platformdirs on MacOS and Windows #1297

Merged
merged 15 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 4 additions & 0 deletions changelog.d/1257.feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Revert platform specific directories on MacOS and Windows
dukecat0 marked this conversation as resolved.
Show resolved Hide resolved
chrysle marked this conversation as resolved.
Show resolved Hide resolved

They were leading to a lot of issues with Windows sandboxing
and spaces in shebangs on MacOS.
9 changes: 5 additions & 4 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ The default binary location for pipx-installed apps is `~/.local/bin`. This can
variable `PIPX_BIN_DIR`. The default manual page location for pipx-installed apps is `~/.local/share/man`. This can be
overridden with the environment variable `PIPX_MAN_DIR`.

pipx's default virtual environment location is typically `~/.local/share/pipx` on Linux/Unix,
`%USERPROFILE%\AppData\Local\pipx` on Windows and `~/Library/Application Support/pipx` on macOS, and for compatibility
reasons, if `~/.local/pipx` exists, it will be used as the default location instead. This can be overridden with the
`PIPX_HOME` environment variable.
pipx's default virtual environment location is typically `~/.local/share/pipx` on Linux/Unix
and `~/.local/pipx` on Windows and MacOS. For compatibility reasons, if `~/.local/pipx` on Linux, `%USERPROFILE%\AppData\Local\pipx`
on Windows or `~/Library/Application Support/pipx` on MacOS exists, it will be used as the default location instead.
This can be overridden with the `PIPX_HOME` environment variable.
dukecat0 marked this conversation as resolved.
Show resolved Hide resolved

As an example, you can install global apps accessible by all users on your system with the following command (on MacOS,
Linux, and Windows WSL):
Expand All @@ -152,6 +152,7 @@ sudo PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin PIPX_MAN_DIR=/usr/local/sha
>
> `user_data_dir()`, `user_cache_dir()` and `user_log_dir()` resolve to appropriate platform-specific user data, cache and log directories.
> See the [platformdirs documentation](https://platformdirs.readthedocs.io/en/latest/api.html#platforms) for details.
> This was reverted in 1.5.0 for Windows and MacOS, except for the cache and log paths.

### Global installation

Expand Down
4 changes: 4 additions & 0 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ data, cache, and log directories under it. To maintain compatibility with older
this old `PIPX_HOME` path if it exists. For a map of old and new paths, see
[Installation](installation.md#installation-options).

In Pipx version 1.5.0, this was reverted for Windows and MacOS. It defaults again to `~/.local/pipx`.

If you have a `pipx` version later than 1.2.0 and want to migrate from the old path to the new paths, you can move the
`~/.local/pipx` directory to the new location (after removing cache, log, and trash directories which will get recreated
automatically) and then reinstall all packages. For example, on Linux systems, `PIPX_HOME` moves from `~/.local/pipx` to
Expand All @@ -153,3 +155,5 @@ rm -rf ~/.local/pipx/{.cache,logs,trash}
mkdir -p ~/.local/share && mv ~/.local/pipx ~/.local/share/
pipx reinstall-all
```

For moving the paths back after 1.5.0, you can perform the same steps, switching the paths around.
10 changes: 10 additions & 0 deletions src/pipx/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,21 @@ def is_windows() -> bool:
return sys.platform == "win32"


def is_macos() -> bool:
return sys.platform == "darwin"


def is_linux() -> bool:
return not WINDOWS and not MACOS
chrysle marked this conversation as resolved.
Show resolved Hide resolved


def is_mingw() -> bool:
return sysconfig.get_platform().startswith("mingw")


WINDOWS: bool = is_windows()
MACOS: bool = is_macos()
LINUX: bool = is_linux()
MINGW: bool = is_mingw()

completion_instructions = dedent(
Expand Down
12 changes: 7 additions & 5 deletions src/pipx/paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

from platformdirs import user_cache_path, user_data_path, user_log_path

DEFAULT_PIPX_HOME = user_data_path("pipx")
FALLBACK_PIPX_HOME = Path.home() / ".local/pipx"
from pipx.constants import LINUX

DEFAULT_PIPX_HOME = user_data_path("pipx") if LINUX else Path.home() / ".local/pipx"
FALLBACK_PIPX_HOME = Path.home() / ".local/pipx" if LINUX else user_data_path("pipx")
DEFAULT_PIPX_BIN_DIR = Path.home() / ".local/bin"
DEFAULT_PIPX_MAN_DIR = Path.home() / ".local/share/man"
DEFAULT_PIPX_GLOBAL_HOME = "/opt/pipx"
Expand All @@ -25,7 +27,7 @@ class _PathContext:
_base_bin: Optional[Union[Path, str]] = get_expanded_environ("PIPX_BIN_DIR")
_base_man: Optional[Union[Path, str]] = get_expanded_environ("PIPX_MAN_DIR")
_base_shared_libs: Optional[Union[Path, str]] = get_expanded_environ("PIPX_SHARED_LIBS")
_fallback_home: Path = Path.home() / ".local/pipx"
_fallback_home: Path = FALLBACK_PIPX_HOME
_home_exists: bool = _base_home is not None or _fallback_home.exists()
log_file: Optional[Path] = None

Expand All @@ -35,7 +37,7 @@ def venvs(self) -> Path:

@property
def logs(self) -> Path:
if self._home_exists:
if self._home_exists or not LINUX:
return self.home / "logs"
return user_log_path("pipx")

Expand All @@ -47,7 +49,7 @@ def trash(self) -> Path:

@property
def venv_cache(self) -> Path:
if self._home_exists:
if self._home_exists or not LINUX:
return self.home / ".cache"
return user_cache_path("pipx")

Expand Down