From c869a211fe05ec64147fa8ef3eff3c830ee6050b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 18:09:04 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 3 ++- src/pipx/commands/common.py | 4 ++-- src/pipx/main.py | 2 +- src/pipx/pipx_metadata_file.py | 2 +- src/pipx/venv.py | 2 +- testdata/empty_project/pyproject.toml | 1 + tests/test_animate.py | 4 ++-- tests/test_install.py | 12 ++++++------ 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b78b5c2991..2b2166c2e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] dynamic = [ "version", @@ -41,7 +42,7 @@ dependencies = [ "packaging>=20", "platformdirs>=2.1", "tomli; python_version<'3.11'", - "userpath!=1.9,>=1.6", + "userpath>=1.6,!=1.9", ] urls."Bug Tracker" = "https://github.com/pypa/pipx/issues" urls.Documentation = "https://pipx.pypa.io" diff --git a/src/pipx/commands/common.py b/src/pipx/commands/common.py index 0f187af977..04d814cb6f 100644 --- a/src/pipx/commands/common.py +++ b/src/pipx/commands/common.py @@ -379,7 +379,7 @@ def package_name_from_spec(package_spec: str, python: str, *, pip_args: List[str # will use the pypi name package_name = pypi_name logger.info(f"Determined package name: {package_name}") - logger.info(f"Package name determined in {time.time()-start_time:.1f}s") + logger.info(f"Package name determined in {time.time() - start_time:.1f}s") return package_name # check syntax and clean up spec and pip_args @@ -390,7 +390,7 @@ def package_name_from_spec(package_spec: str, python: str, *, pip_args: List[str venv.create_venv(venv_args=[], pip_args=[]) package_name = venv.install_package_no_deps(package_or_url=package_spec, pip_args=pip_args) - logger.info(f"Package name determined in {time.time()-start_time:.1f}s") + logger.info(f"Package name determined in {time.time() - start_time:.1f}s") return package_name diff --git a/src/pipx/main.py b/src/pipx/main.py index f06e47c4e2..c1e87a2287 100644 --- a/src/pipx/main.py +++ b/src/pipx/main.py @@ -163,7 +163,7 @@ def __init__(self, venv_container: VenvContainer) -> None: self.packages = [str(p.name) for p in sorted(venv_container.iter_venv_dirs())] def use(self, prefix: str, **kwargs: Any) -> List[str]: - return [f"{prefix}{x[len(prefix):]}" for x in self.packages if x.startswith(canonicalize_name(prefix))] + return [f"{prefix}{x[len(prefix) :]}" for x in self.packages if x.startswith(canonicalize_name(prefix))] def get_pip_args(parsed_args: Dict[str, str]) -> List[str]: diff --git a/src/pipx/pipx_metadata_file.py b/src/pipx/pipx_metadata_file.py index 3362698e9f..cb97510e76 100644 --- a/src/pipx/pipx_metadata_file.py +++ b/src/pipx/pipx_metadata_file.py @@ -114,7 +114,7 @@ def _convert_legacy_metadata(self, metadata_dict: Dict[str, Any]) -> Dict[str, A raise PipxError( f""" {self.venv_dir.name}: Unknown metadata version - {metadata_dict['pipx_metadata_version']}. Perhaps it was + {metadata_dict["pipx_metadata_version"]}. Perhaps it was installed with a later version of pipx. """ ) diff --git a/src/pipx/venv.py b/src/pipx/venv.py index 422de3da08..123eea6ee5 100644 --- a/src/pipx/venv.py +++ b/src/pipx/venv.py @@ -348,7 +348,7 @@ def install_package_no_deps(self, package_or_url: str, pip_args: List[str]) -> s def get_venv_metadata_for_package(self, package_name: str, package_extras: Set[str]) -> VenvMetadata: data_start = time.time() venv_metadata = inspect_venv(package_name, package_extras, self.bin_path, self.python_path, self.man_path) - logger.info(f"get_venv_metadata_for_package: {1e3*(time.time()-data_start):.0f}ms") + logger.info(f"get_venv_metadata_for_package: {1e3 * (time.time() - data_start):.0f}ms") return venv_metadata def update_package_metadata( diff --git a/testdata/empty_project/pyproject.toml b/testdata/empty_project/pyproject.toml index 9b59eaa14c..8f29ebbbd6 100644 --- a/testdata/empty_project/pyproject.toml +++ b/testdata/empty_project/pyproject.toml @@ -20,6 +20,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] scripts.empty-project = "empty_project.main:cli" entry-points."pipx.run".empty-project = "empty_project.main:cli" diff --git a/tests/test_animate.py b/tests/test_animate.py index d70e0b2e36..758d2bdb73 100644 --- a/tests/test_animate.py +++ b/tests/test_animate.py @@ -66,7 +66,7 @@ def test_delay_suppresses_output(capsys, monkeypatch): @pytest.mark.parametrize( "env_columns,expected_frame_message", [ - (45, f"{TEST_STRING_40_CHAR:.{45-6}}..."), + (45, f"{TEST_STRING_40_CHAR:.{45 - 6}}..."), (46, f"{TEST_STRING_40_CHAR}"), (47, f"{TEST_STRING_40_CHAR}"), ], @@ -87,7 +87,7 @@ def test_line_lengths_emoji(capsys, monkeypatch, env_columns, expected_frame_mes @pytest.mark.parametrize( "env_columns,expected_frame_message", [ - (43, f"{TEST_STRING_40_CHAR:.{43-4}}"), + (43, f"{TEST_STRING_40_CHAR:.{43 - 4}}"), (44, f"{TEST_STRING_40_CHAR}"), (45, f"{TEST_STRING_40_CHAR}"), ], diff --git a/tests/test_install.py b/tests/test_install.py index 2cff936880..e794e41227 100644 --- a/tests/test_install.py +++ b/tests/test_install.py @@ -409,15 +409,15 @@ def test_passed_python_and_force_flag_warning(pipx_temp_env, capsys): assert not run_pipx_cli(["install", "black", "--force"]) captured = capsys.readouterr() - assert ( - "--python is ignored when --force is passed." not in captured.out - ), "Should only print warning if both flags present" + assert "--python is ignored when --force is passed." not in captured.out, ( + "Should only print warning if both flags present" + ) assert not run_pipx_cli(["install", "pycowsay", "--force"]) captured = capsys.readouterr() - assert ( - "--python is ignored when --force is passed." not in captured.out - ), "Should not print warning if package does not exist yet" + assert "--python is ignored when --force is passed." not in captured.out, ( + "Should not print warning if package does not exist yet" + ) @pytest.mark.parametrize(