Skip to content

Commit

Permalink
Remove special case for MacOS config directory
Browse files Browse the repository at this point in the history
  • Loading branch information
Secrus authored and abn committed Feb 25, 2024
1 parent 0a0aad3 commit 2fb261c
Showing 1 changed file with 1 addition and 29 deletions.
30 changes: 1 addition & 29 deletions src/poetry/locations.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from __future__ import annotations

import logging
import os
import sys

from pathlib import Path

Expand All @@ -11,8 +9,6 @@
from platformdirs import user_data_path


logger = logging.getLogger(__name__)

_APP_NAME = "pypoetry"

DEFAULT_CACHE_DIR = user_cache_path(_APP_NAME, appauthor=False)
Expand All @@ -21,33 +17,9 @@
or user_config_path(_APP_NAME, appauthor=False, roaming=True)
)

# platformdirs 2.0.0 corrected the OSX/macOS config directory from
# /Users/<user>/Library/Application Support/<appname> to
# /Users/<user>/Library/Preferences/<appname>.
#
# Then platformdirs 3.0.0 corrected it back again!
#
# Treat Preferences as deprecated, and hope that this is finally decided.
if sys.platform == "darwin":
_LEGACY_CONFIG_DIR = CONFIG_DIR.parent.parent / "Preferences" / _APP_NAME
config_toml = _LEGACY_CONFIG_DIR / "config.toml"
auth_toml = _LEGACY_CONFIG_DIR / "auth.toml"

if any(file.exists() for file in (auth_toml, config_toml)):
logger.warning(
"Configuration file exists at %s, reusing this"
" directory.\n\nConsider moving TOML configuration files to %s, as"
" support for the legacy directory will be removed in an upcoming"
" release.",
_LEGACY_CONFIG_DIR,
CONFIG_DIR,
)
CONFIG_DIR = _LEGACY_CONFIG_DIR


def data_dir() -> Path:
poetry_home = os.getenv("POETRY_HOME")
if poetry_home:
if poetry_home := os.getenv("POETRY_HOME"):
return Path(poetry_home).expanduser()

return user_data_path(_APP_NAME, appauthor=False, roaming=True)

0 comments on commit 2fb261c

Please sign in to comment.