diff --git a/src/poetry/config/config.py b/src/poetry/config/config.py index 6d7658645ae..772ca528a72 100644 --- a/src/poetry/config/config.py +++ b/src/poetry/config/config.py @@ -135,12 +135,9 @@ class Config: }, } - def __init__( - self, use_environment: bool = True, base_dir: Path | None = None - ) -> None: + def __init__(self, use_environment: bool = True) -> None: self._config = deepcopy(self.default_config) self._use_environment = use_environment - self._base_dir = base_dir self._config_source: ConfigSource = DictConfigSource() self._auth_config_source: ConfigSource = DictConfigSource() diff --git a/src/poetry/config/file_config_source.py b/src/poetry/config/file_config_source.py index 0f7c2a71605..eed4cd053ca 100644 --- a/src/poetry/config/file_config_source.py +++ b/src/poetry/config/file_config_source.py @@ -19,9 +19,8 @@ class FileConfigSource(ConfigSource): - def __init__(self, file: TOMLFile, auth_config: bool = False) -> None: + def __init__(self, file: TOMLFile) -> None: self._file = file - self._auth_config = auth_config @property def name(self) -> str: diff --git a/src/poetry/console/commands/command.py b/src/poetry/console/commands/command.py index 2aba4e6be24..b4fc2fda0e8 100644 --- a/src/poetry/console/commands/command.py +++ b/src/poetry/console/commands/command.py @@ -24,9 +24,6 @@ def poetry(self) -> Poetry: return self._poetry - def set_poetry(self, poetry: Poetry) -> None: - self._poetry = poetry - def get_application(self) -> Application: from poetry.console.application import Application diff --git a/src/poetry/console/commands/version.py b/src/poetry/console/commands/version.py index 0af2a004719..02c7c66bcbb 100644 --- a/src/poetry/console/commands/version.py +++ b/src/poetry/console/commands/version.py @@ -48,16 +48,6 @@ class VersionCommand(Command): patch, minor, major, prepatch, preminor, premajor, prerelease. """ - RESERVED = { - "major", - "minor", - "patch", - "premajor", - "preminor", - "prepatch", - "prerelease", - } - def handle(self) -> int: version = self.argument("version") diff --git a/src/poetry/exceptions.py b/src/poetry/exceptions.py index 0d755667594..68154f8d87d 100644 --- a/src/poetry/exceptions.py +++ b/src/poetry/exceptions.py @@ -3,7 +3,3 @@ class PoetryException(Exception): pass - - -class InvalidProjectFile(PoetryException): - pass diff --git a/src/poetry/factory.py b/src/poetry/factory.py index 828ce26bc24..d6745ee5bcc 100644 --- a/src/poetry/factory.py +++ b/src/poetry/factory.py @@ -12,7 +12,6 @@ from packaging.utils import canonicalize_name from poetry.core.factory import Factory as BaseFactory from poetry.core.packages.dependency_group import MAIN_GROUP -from poetry.core.packages.project_package import ProjectPackage from poetry.config.config import Config from poetry.exceptions import PoetryException @@ -102,15 +101,10 @@ def create_poetry( plugin_manager = PluginManager(Plugin.group, disable_plugins=disable_plugins) plugin_manager.load_plugins() - poetry.set_plugin_manager(plugin_manager) plugin_manager.activate(poetry, io) return poetry - @classmethod - def get_package(cls, name: str, version: str) -> ProjectPackage: - return ProjectPackage(name, version) - @classmethod def create_pool( cls, diff --git a/src/poetry/installation/executor.py b/src/poetry/installation/executor.py index a0ebcbcf910..23d807c21ed 100644 --- a/src/poetry/installation/executor.py +++ b/src/poetry/installation/executor.py @@ -87,8 +87,6 @@ def __init__( self._chooser = Chooser(pool, self._env, config) self._executor = ThreadPoolExecutor(max_workers=self._max_workers) - self._total_operations = 0 - self._executed_operations = 0 self._executed = {"install": 0, "update": 0, "uninstall": 0} self._skipped = {"install": 0, "update": 0, "uninstall": 0} self._sections: dict[int, SectionOutput] = {} @@ -151,7 +149,6 @@ def pip_install( return 0 def execute(self, operations: list[Operation]) -> int: - self._total_operations = len(operations) for job_type in self._executed: self._executed[job_type] = 0 self._skipped[job_type] = 0 @@ -410,7 +407,6 @@ def _do_execute_operation(self, operation: Operation) -> int: def _increment_operations_count(self, operation: Operation, executed: bool) -> None: with self._lock: if executed: - self._executed_operations += 1 self._executed[operation.job_type] += 1 else: self._skipped[operation.job_type] += 1 diff --git a/src/poetry/installation/operations/operation.py b/src/poetry/installation/operations/operation.py index 816618a1b8d..013929f23f8 100644 --- a/src/poetry/installation/operations/operation.py +++ b/src/poetry/installation/operations/operation.py @@ -51,9 +51,3 @@ def skip(self: T, reason: str) -> T: self._skip_reason = reason return self - - def unskip(self: T) -> T: - self._skipped = False - self._skip_reason = None - - return self diff --git a/src/poetry/json/__init__.py b/src/poetry/json/__init__.py index de4f1789866..5b02eb304c2 100644 --- a/src/poetry/json/__init__.py +++ b/src/poetry/json/__init__.py @@ -14,10 +14,6 @@ SCHEMA_DIR = Path(__file__).parent / "schemas" -class ValidationError(ValueError): - pass - - def validate_object(obj: dict[str, Any]) -> list[str]: schema_file = Path(SCHEMA_DIR, "poetry.json") schema = json.loads(schema_file.read_text(encoding="utf-8")) diff --git a/src/poetry/poetry.py b/src/poetry/poetry.py index dfbe043594c..8869845d852 100644 --- a/src/poetry/poetry.py +++ b/src/poetry/poetry.py @@ -85,11 +85,6 @@ def set_config(self, config: Config) -> Poetry: return self - def set_plugin_manager(self, plugin_manager: PluginManager) -> Poetry: - self._plugin_manager = plugin_manager - - return self - def get_sources(self) -> list[Source]: return [ Source(**source) diff --git a/src/poetry/repositories/lockfile_repository.py b/src/poetry/repositories/lockfile_repository.py index 25eff224938..8c09629b877 100644 --- a/src/poetry/repositories/lockfile_repository.py +++ b/src/poetry/repositories/lockfile_repository.py @@ -20,13 +20,3 @@ def __init__(self) -> None: def has_package(self, package: Package) -> bool: return any(p == package for p in self.packages) - - def remove_package(self, package: Package) -> None: - index = None - for i, repo_package in enumerate(self.packages): - if repo_package == package: - index = i - break - - if index is not None: - del self._packages[index] diff --git a/src/poetry/repositories/repository.py b/src/poetry/repositories/repository.py index 5211a4a204b..1f6aef2ff7c 100644 --- a/src/poetry/repositories/repository.py +++ b/src/poetry/repositories/repository.py @@ -69,18 +69,6 @@ def has_package(self, package: Package) -> bool: def add_package(self, package: Package) -> None: self._packages.append(package) - def remove_package(self, package: Package) -> None: - package_id = package.unique_name - - index = None - for i, repo_package in enumerate(self.packages): - if package_id == repo_package.unique_name: - index = i - break - - if index is not None: - del self._packages[index] - def search(self, query: str) -> list[Package]: results: list[Package] = [] diff --git a/src/poetry/utils/authenticator.py b/src/poetry/utils/authenticator.py index 23b52df97dc..0808bf44ce3 100644 --- a/src/poetry/utils/authenticator.py +++ b/src/poetry/utils/authenticator.py @@ -77,10 +77,6 @@ def __post_init__(self) -> None: def certs(self, config: Config) -> RepositoryCertificateConfig: return RepositoryCertificateConfig.create(self.name, config) - @property - def http_credential_keys(self) -> list[str]: - return [self.url, self.netloc, self.name] - def get_http_credentials( self, password_manager: PasswordManager, username: str | None = None ) -> HTTPAuthCredential: diff --git a/src/poetry/utils/env/base_env.py b/src/poetry/utils/env/base_env.py index eb8dac6cf97..43f2d7fedd7 100644 --- a/src/poetry/utils/env/base_env.py +++ b/src/poetry/utils/env/base_env.py @@ -270,12 +270,6 @@ def get_base_prefix(cls) -> Path: return Path(sys.prefix) - def get_version_info(self) -> tuple[Any, ...]: - raise NotImplementedError() - - def get_python_implementation(self) -> str: - raise NotImplementedError() - def get_marker_env(self) -> dict[str, Any]: raise NotImplementedError() diff --git a/src/poetry/utils/env/site_packages.py b/src/poetry/utils/env/site_packages.py index f91caf267e5..844d63936ce 100644 --- a/src/poetry/utils/env/site_packages.py +++ b/src/poetry/utils/env/site_packages.py @@ -32,7 +32,6 @@ def __init__( self._platlib = purelib self._fallbacks = fallbacks or [] - self._skip_write_checks = skip_write_checks self._candidates: list[Path] = [] for path in itertools.chain([self._purelib, self._platlib], self._fallbacks): diff --git a/src/poetry/utils/env/system_env.py b/src/poetry/utils/env/system_env.py index e088e684480..0a548a194e5 100644 --- a/src/poetry/utils/env/system_env.py +++ b/src/poetry/utils/env/system_env.py @@ -31,12 +31,6 @@ def python(self) -> Path: def sys_path(self) -> list[str]: return sys.path - def get_version_info(self) -> tuple[Any, ...]: - return tuple(sys.version_info) - - def get_python_implementation(self) -> str: - return platform.python_implementation() - def get_paths(self) -> dict[str, str]: import site diff --git a/src/poetry/utils/env/virtual_env.py b/src/poetry/utils/env/virtual_env.py index c8a81153f66..a378daf79ae 100644 --- a/src/poetry/utils/env/virtual_env.py +++ b/src/poetry/utils/env/virtual_env.py @@ -19,7 +19,6 @@ from poetry.utils.env.script_strings import GET_BASE_PREFIX from poetry.utils.env.script_strings import GET_ENVIRONMENT_INFO from poetry.utils.env.script_strings import GET_PATHS -from poetry.utils.env.script_strings import GET_PYTHON_VERSION from poetry.utils.env.script_strings import GET_SYS_PATH from poetry.utils.env.script_strings import GET_SYS_TAGS from poetry.utils.env.system_env import SystemEnv @@ -51,16 +50,6 @@ def sys_path(self) -> list[str]: paths: list[str] = json.loads(output) return paths - def get_version_info(self) -> tuple[Any, ...]: - output = self.run_python_script(GET_PYTHON_VERSION) - assert isinstance(output, str) - - return tuple(int(s) for s in output.strip().split(".")) - - def get_python_implementation(self) -> str: - implementation: str = self.marker_env["platform_python_implementation"] - return implementation - def get_supported_tags(self) -> list[Tag]: output = self.run_python_script(GET_SYS_TAGS) diff --git a/src/poetry/utils/password_manager.py b/src/poetry/utils/password_manager.py index 166386f4565..a7177e5b3d1 100644 --- a/src/poetry/utils/password_manager.py +++ b/src/poetry/utils/password_manager.py @@ -13,10 +13,6 @@ logger = logging.getLogger(__name__) -class PasswordManagerError(Exception): - pass - - class PoetryKeyringError(Exception): pass diff --git a/tests/repositories/test_lockfile_repository.py b/tests/repositories/test_lockfile_repository.py index ae65b682891..5ffdfbe5783 100644 --- a/tests/repositories/test_lockfile_repository.py +++ b/tests/repositories/test_lockfile_repository.py @@ -37,25 +37,3 @@ def test_has_package(packages: list[Package]) -> None: assert repo.has_package(deepcopy(url_package)) assert repo.has_package(deepcopy(pypi_package)) assert repo.has_package(deepcopy(url_package_2)) - - -def test_remove_package(packages: list[Package]) -> None: - url_package, pypi_package, url_package_2 = packages - - repo = LockfileRepository() - repo.add_package(url_package) - repo.add_package(pypi_package) - repo.add_package(url_package_2) - - assert len(repo.packages) == 3 - - repo.remove_package(deepcopy(pypi_package)) - assert len(repo.packages) == 2 - repo.remove_package(pypi_package) - assert len(repo.packages) == 2 - - repo.remove_package(deepcopy(url_package_2)) - assert len(repo.packages) == 1 - assert repo.packages[0] == url_package - repo.remove_package(url_package_2) - assert len(repo.packages) == 1