Skip to content

Commit

Permalink
Remove dead code (#6097)
Browse files Browse the repository at this point in the history
  • Loading branch information
dimbleby committed Apr 8, 2024
1 parent 29d3c5f commit 925424a
Show file tree
Hide file tree
Showing 19 changed files with 2 additions and 124 deletions.
5 changes: 1 addition & 4 deletions src/poetry/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,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()

Expand Down
3 changes: 1 addition & 2 deletions src/poetry/config/file_config_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions src/poetry/console/commands/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,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

Expand Down
10 changes: 0 additions & 10 deletions src/poetry/console/commands/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,6 @@ class VersionCommand(Command):
patch, minor, major, prepatch, preminor, premajor, prerelease.
"""

RESERVED: ClassVar[set[str]] = {
"major",
"minor",
"patch",
"premajor",
"preminor",
"prepatch",
"prerelease",
}

def handle(self) -> int:
version = self.argument("version")

Expand Down
4 changes: 0 additions & 4 deletions src/poetry/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@

class PoetryException(Exception):
pass


class InvalidProjectFile(PoetryException):
pass
6 changes: 0 additions & 6 deletions src/poetry/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions src/poetry/installation/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,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] = {}
Expand Down Expand Up @@ -160,7 +158,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
Expand Down Expand Up @@ -404,7 +401,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
Expand Down
6 changes: 0 additions & 6 deletions src/poetry/installation/operations/operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions src/poetry/json/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
5 changes: 0 additions & 5 deletions src/poetry/poetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions src/poetry/repositories/lockfile_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
12 changes: 0 additions & 12 deletions src/poetry/repositories/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -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] = []

Expand Down
4 changes: 0 additions & 4 deletions src/poetry/utils/authenticator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 0 additions & 6 deletions src/poetry/utils/env/base_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,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()

Expand Down
1 change: 0 additions & 1 deletion src/poetry/utils/env/site_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 0 additions & 6 deletions src/poetry/utils/env/system_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,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

Expand Down
11 changes: 0 additions & 11 deletions src/poetry/utils/env/virtual_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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
Expand Down Expand Up @@ -50,16 +49,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)

Expand Down
4 changes: 0 additions & 4 deletions src/poetry/utils/password_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
logger = logging.getLogger(__name__)


class PasswordManagerError(Exception):
pass


class PoetryKeyringError(Exception):
pass

Expand Down
22 changes: 0 additions & 22 deletions tests/repositories/test_lockfile_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 925424a

Please sign in to comment.