From 9eac49e412deb198996a0b4647192291c8a84653 Mon Sep 17 00:00:00 2001 From: David Hotham Date: Sat, 28 Oct 2023 12:33:20 +0100 Subject: [PATCH 1/2] update ruff --- .pre-commit-config.yaml | 2 +- pyproject.toml | 21 +++++++++++-------- src/poetry/console/application.py | 2 +- .../solutions/python_requirement_solution.py | 4 ++-- src/poetry/mixology/version_solver.py | 2 +- src/poetry/publishing/uploader.py | 2 +- tests/installation/test_chooser.py | 12 +++++------ tests/installation/test_executor.py | 20 +++++++++--------- tests/installation/test_installer.py | 8 +++---- .../masonry/builders/test_editable_builder.py | 2 +- .../test_python_requirement_solution.py | 4 ++-- tests/packages/test_locker.py | 2 +- tests/puzzle/test_solver.py | 12 +++++------ tests/repositories/test_legacy_repository.py | 14 ++++++------- tests/repositories/test_pypi_repository.py | 4 ++-- tests/utils/test_cache.py | 4 ++-- tests/utils/test_env.py | 2 +- tests/utils/test_helpers.py | 20 +++++++++--------- 18 files changed, 70 insertions(+), 67 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e9b7453bc6..0c429bbfc0e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,6 +31,6 @@ repos: - id: validate_manifest - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.291 + rev: v0.1.3 hooks: - id: ruff diff --git a/pyproject.toml b/pyproject.toml index 19cef589ab1..a2ed3c5c8e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -91,12 +91,20 @@ build-backend = "poetry.core.masonry.api" [tool.ruff] +extend-exclude = [ + "docs/*", + # External to the project's coding standards + "tests/**/fixtures/*", +] fix = true +line-length = 88 +src = ["src"] +target-version = "py38" + +[tool.ruff.lint] unfixable = [ "ERA", # do not autoremove commented out code ] -target-version = "py38" -line-length = 88 extend-select = [ "B", # flake8-bugbear "C4", # flake8-comprehensions @@ -116,16 +124,11 @@ ignore = [ "B905", # use explicit 'strict=' parameter with 'zip()' "N818", # Exception name should be named with an Error suffix ] -extend-exclude = [ - "docs/*", - # External to the project's coding standards - "tests/**/fixtures/*", -] -[tool.ruff.flake8-tidy-imports] +[tool.ruff.lint.flake8-tidy-imports] ban-relative-imports = "all" -[tool.ruff.isort] +[tool.ruff.lint.isort] force-single-line = true lines-between-types = 1 lines-after-imports = 2 diff --git a/src/poetry/console/application.py b/src/poetry/console/application.py index b6973085947..3286c73f80b 100644 --- a/src/poetry/console/application.py +++ b/src/poetry/console/application.py @@ -397,7 +397,7 @@ def _get_solution_provider_repository(self) -> SolutionProviderRepository: SolutionProviderRepository, ) - from poetry.mixology.solutions.providers.python_requirement_solution_provider import ( # noqa: E501 + from poetry.mixology.solutions.providers.python_requirement_solution_provider import ( PythonRequirementSolutionProvider, ) diff --git a/src/poetry/mixology/solutions/solutions/python_requirement_solution.py b/src/poetry/mixology/solutions/solutions/python_requirement_solution.py index b625e124610..9856ca30eef 100644 --- a/src/poetry/mixology/solutions/solutions/python_requirement_solution.py +++ b/src/poetry/mixology/solutions/solutions/python_requirement_solution.py @@ -58,6 +58,6 @@ def solution_description(self) -> str: @property def documentation_links(self) -> list[str]: return [ - "https://python-poetry.org/docs/dependency-specification/#python-restricted-dependencies", # noqa: E501 - "https://python-poetry.org/docs/dependency-specification/#using-environment-markers", # noqa: E501 + "https://python-poetry.org/docs/dependency-specification/#python-restricted-dependencies", + "https://python-poetry.org/docs/dependency-specification/#using-environment-markers", ] diff --git a/src/poetry/mixology/version_solver.py b/src/poetry/mixology/version_solver.py index 5c613a77f0a..55e76a5db2c 100644 --- a/src/poetry/mixology/version_solver.py +++ b/src/poetry/mixology/version_solver.py @@ -394,7 +394,7 @@ def _resolve_conflict(self, incompatibility: Incompatibility) -> Incompatibility # details. # # .. _algorithm documentation: - # https://github.com/dart-lang/pub/tree/master/doc/solver.md#conflict-resolution # noqa: E501 + # https://github.com/dart-lang/pub/tree/master/doc/solver.md#conflict-resolution if difference is not None: inverse = difference.inverse if inverse.dependency != most_recent_satisfier.dependency: diff --git a/src/poetry/publishing/uploader.py b/src/poetry/publishing/uploader.py index c10b49bf513..ab415dbfdd2 100644 --- a/src/poetry/publishing/uploader.py +++ b/src/poetry/publishing/uploader.py @@ -322,7 +322,7 @@ def _get_type(self, file: Path) -> str: raise ValueError("Unknown distribution format " + "".join(exts)) def _is_file_exists_error(self, response: requests.Response) -> bool: - # based on https://github.com/pypa/twine/blob/a6dd69c79f7b5abfb79022092a5d3776a499e31b/twine/commands/upload.py#L32 # noqa: E501 + # based on https://github.com/pypa/twine/blob/a6dd69c79f7b5abfb79022092a5d3776a499e31b/twine/commands/upload.py#L32 status = response.status_code reason = response.reason.lower() text = response.text.lower() diff --git a/tests/installation/test_chooser.py b/tests/installation/test_chooser.py index 6c9930f899a..c2027dcbd29 100644 --- a/tests/installation/test_chooser.py +++ b/tests/installation/test_chooser.py @@ -277,7 +277,7 @@ def test_chooser_chooses_distributions_that_match_the_package_hashes( package = Package("isort", "4.3.4") files = [ { - "hash": "sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8", # noqa: E501 + "hash": "sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8", "filename": "isort-4.3.4.tar.gz", } ] @@ -311,7 +311,7 @@ def test_chooser_chooses_yanked_if_no_others( files = [ { "filename": "black-21.11b0-py3-none-any.whl", - "hash": "sha256:0b1f66cbfadcd332ceeaeecf6373d9991d451868d2e2219ad0ac1213fb701117", # noqa: E501 + "hash": "sha256:0b1f66cbfadcd332ceeaeecf6373d9991d451868d2e2219ad0ac1213fb701117", } ] if source_type == "legacy": @@ -342,11 +342,11 @@ def test_chooser_does_not_choose_yanked_if_others( files = [ { "filename": "futures-3.2.0-py2-none-any.whl", - "hash": "sha256:ec0a6cb848cc212002b9828c3e34c675e0c9ff6741dc445cab6fdd4e1085d1f1", # noqa: E501 + "hash": "sha256:ec0a6cb848cc212002b9828c3e34c675e0c9ff6741dc445cab6fdd4e1085d1f1", }, { "filename": "futures-3.2.0.tar.gz", - "hash": "sha256:9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265", # noqa: E501 + "hash": "sha256:9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265", }, ] package = Package( @@ -387,7 +387,7 @@ def test_chooser_throws_an_error_if_package_hashes_do_not_match( package = Package("isort", "4.3.4") files = [ { - "hash": "sha256:0000000000000000000000000000000000000000000000000000000000000000", # noqa: E501 + "hash": "sha256:0000000000000000000000000000000000000000000000000000000000000000", "filename": "isort-4.3.4.tar.gz", } ] @@ -421,7 +421,7 @@ def test_chooser_md5_remote_fallback_to_sha256_inline_calculation( ) package.files = [ { - "hash": "sha256:9fa123ad707a5c6c944743bf3e11a0e80d86cb518d3cf25320866ca3ef43e2ad", # noqa: E501 + "hash": "sha256:9fa123ad707a5c6c944743bf3e11a0e80d86cb518d3cf25320866ca3ef43e2ad", "filename": "demo-0.1.0.tar.gz", } ] diff --git a/tests/installation/test_executor.py b/tests/installation/test_executor.py index 4e0ad9cb091..7272449588f 100644 --- a/tests/installation/test_executor.py +++ b/tests/installation/test_executor.py @@ -473,11 +473,11 @@ def test_execute_works_with_ansi_output( # fmt: off expected = [ - "\x1b[39;1mPackage operations\x1b[39;22m: \x1b[34m1\x1b[39m install, \x1b[34m0\x1b[39m updates, \x1b[34m0\x1b[39m removals", # noqa: E501 - "\x1b[34;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[39;1m1.0.0a5\x1b[39;22m\x1b[39m)\x1b[39m: \x1b[34mPending...\x1b[39m", # noqa: E501 - "\x1b[34;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[39;1m1.0.0a5\x1b[39;22m\x1b[39m)\x1b[39m: \x1b[34mDownloading...\x1b[39m", # noqa: E501 - "\x1b[34;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[39;1m1.0.0a5\x1b[39;22m\x1b[39m)\x1b[39m: \x1b[34mInstalling...\x1b[39m", # noqa: E501 - "\x1b[32;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[32m1.0.0a5\x1b[39m\x1b[39m)\x1b[39m", # finished # noqa: E501 + "\x1b[39;1mPackage operations\x1b[39;22m: \x1b[34m1\x1b[39m install, \x1b[34m0\x1b[39m updates, \x1b[34m0\x1b[39m removals", + "\x1b[34;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[39;1m1.0.0a5\x1b[39;22m\x1b[39m)\x1b[39m: \x1b[34mPending...\x1b[39m", + "\x1b[34;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[39;1m1.0.0a5\x1b[39;22m\x1b[39m)\x1b[39m: \x1b[34mDownloading...\x1b[39m", + "\x1b[34;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[39;1m1.0.0a5\x1b[39;22m\x1b[39m)\x1b[39m: \x1b[34mInstalling...\x1b[39m", + "\x1b[32;1m•\x1b[39;22m \x1b[39mInstalling \x1b[39m\x1b[36mcleo\x1b[39m\x1b[39m (\x1b[39m\x1b[32m1.0.0a5\x1b[39m\x1b[39m)\x1b[39m", # finished ] # fmt: on @@ -669,7 +669,7 @@ def test_executor_should_not_write_pep610_url_references_for_cached_package( package.files = [ { "file": "demo-0.1.0-py2.py3-none-any.whl", - "hash": "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a", # noqa: E501 + "hash": "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a", } ] @@ -696,7 +696,7 @@ def test_executor_should_write_pep610_url_references_for_wheel_files( package.files = [ { "file": "demo-0.1.0-py2.py3-none-any.whl", - "hash": "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a", # noqa: E501 + "hash": "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a", } ] @@ -729,7 +729,7 @@ def test_executor_should_write_pep610_url_references_for_non_wheel_files( package.files = [ { "file": "demo-0.1.0.tar.gz", - "hash": "sha256:9fa123ad707a5c6c944743bf3e11a0e80d86cb518d3cf25320866ca3ef43e2ad", # noqa: E501 + "hash": "sha256:9fa123ad707a5c6c944743bf3e11a0e80d86cb518d3cf25320866ca3ef43e2ad", } ] @@ -838,7 +838,7 @@ def test_executor_should_write_pep610_url_references_for_wheel_urls( package.files = [ { "file": "demo-0.1.0-py2.py3-none-any.whl", - "hash": "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a", # noqa: E501 + "hash": "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a", } ] @@ -928,7 +928,7 @@ def mock_get_cached_archive_for_link_func( package.files = [ { "file": "demo-0.1.0.tar.gz", - "hash": "sha256:9fa123ad707a5c6c944743bf3e11a0e80d86cb518d3cf25320866ca3ef43e2ad", # noqa: E501 + "hash": "sha256:9fa123ad707a5c6c944743bf3e11a0e80d86cb518d3cf25320866ca3ef43e2ad", } ] diff --git a/tests/installation/test_installer.py b/tests/installation/test_installer.py index 545486e5d11..00dab4e405b 100644 --- a/tests/installation/test_installer.py +++ b/tests/installation/test_installer.py @@ -485,7 +485,7 @@ def test_run_install_does_not_remove_locked_packages_if_installed_but_not_requir assert installer.executor.removals_count == 0 -def test_run_install_removes_locked_packages_if_installed_and_synchronization_is_required( # noqa: E501 +def test_run_install_removes_locked_packages_if_installed_and_synchronization_is_required( installer: Installer, locker: Locker, repo: Repository, @@ -1852,7 +1852,7 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda @pytest.mark.skip( "This is not working at the moment due to limitations in the resolver" ) -def test_installer_test_solver_finds_compatible_package_for_dependency_python_not_fully_compatible_with_package_python( # noqa: E501 +def test_installer_test_solver_finds_compatible_package_for_dependency_python_not_fully_compatible_with_package_python( installer: Installer, locker: Locker, repo: Repository, @@ -1881,7 +1881,7 @@ def test_installer_test_solver_finds_compatible_package_for_dependency_python_no assert installer.executor.installations_count == 1 -def test_installer_required_extras_should_not_be_removed_when_updating_single_dependency( # noqa: E501 +def test_installer_required_extras_should_not_be_removed_when_updating_single_dependency( installer: Installer, locker: Locker, repo: Repository, @@ -1948,7 +1948,7 @@ def test_installer_required_extras_should_not_be_removed_when_updating_single_de assert installer.executor.removals_count == 0 -def test_installer_required_extras_should_not_be_removed_when_updating_single_dependency_pypi_repository( # noqa: E501 +def test_installer_required_extras_should_not_be_removed_when_updating_single_dependency_pypi_repository( locker: Locker, repo: Repository, package: ProjectPackage, diff --git a/tests/masonry/builders/test_editable_builder.py b/tests/masonry/builders/test_editable_builder.py index 80a68c1fe9c..aa7e9e03ef7 100644 --- a/tests/masonry/builders/test_editable_builder.py +++ b/tests/masonry/builders/test_editable_builder.py @@ -29,9 +29,9 @@ if TYPE_CHECKING: from pytest_mock import MockerFixture + from tests.types import FixtureDirGetter from poetry.poetry import Poetry - from tests.types import FixtureDirGetter @pytest.fixture() diff --git a/tests/mixology/solutions/solutions/test_python_requirement_solution.py b/tests/mixology/solutions/solutions/test_python_requirement_solution.py index 7e62713c6d9..6eafb44938d 100644 --- a/tests/mixology/solutions/solutions/test_python_requirement_solution.py +++ b/tests/mixology/solutions/solutions/test_python_requirement_solution.py @@ -26,8 +26,8 @@ def test_it_provides_the_correct_solution() -> None: For foo, a possible solution would be to set the `python` property to ">=3.6,<4.0"\ """ links = [ - "https://python-poetry.org/docs/dependency-specification/#python-restricted-dependencies", # noqa: E501 - "https://python-poetry.org/docs/dependency-specification/#using-environment-markers", # noqa: E501 + "https://python-poetry.org/docs/dependency-specification/#python-restricted-dependencies", + "https://python-poetry.org/docs/dependency-specification/#using-environment-markers", ] assert title == solution.solution_title diff --git a/tests/packages/test_locker.py b/tests/packages/test_locker.py index e115c32c799..adf143d5cc5 100644 --- a/tests/packages/test_locker.py +++ b/tests/packages/test_locker.py @@ -819,7 +819,7 @@ def test_extras_dependencies_are_ordered(locker: Locker, root: ProjectPackage) - assert content == expected -def test_locker_should_neither_emit_warnings_nor_raise_error_for_lower_compatible_versions( # noqa: E501 +def test_locker_should_neither_emit_warnings_nor_raise_error_for_lower_compatible_versions( locker: Locker, caplog: LogCaptureFixture ) -> None: older_version = "1.1" diff --git a/tests/puzzle/test_solver.py b/tests/puzzle/test_solver.py index 5b5b880e232..4cf5b3943d0 100644 --- a/tests/puzzle/test_solver.py +++ b/tests/puzzle/test_solver.py @@ -1108,7 +1108,7 @@ def test_solver_with_dependency_in_both_main_and_dev_dependencies( ) -def test_solver_with_dependency_in_both_main_and_dev_dependencies_with_one_more_dependent( # noqa: E501 +def test_solver_with_dependency_in_both_main_and_dev_dependencies_with_one_more_dependent( solver: Solver, repo: Repository, package: ProjectPackage ) -> None: package.add_dependency(Factory.create_dependency("A", "*")) @@ -2258,7 +2258,7 @@ def test_solver_can_resolve_git_dependencies_with_ref( assert op.package.source_resolved_reference.startswith("9cf87a2") -def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requirement_is_compatible( # noqa: E501 +def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requirement_is_compatible( solver: Solver, repo: Repository, package: ProjectPackage ) -> None: set_package_python_versions(solver.provider, "~2.7 || ^3.4") @@ -2276,7 +2276,7 @@ def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requir check_solver_result(transaction, [{"job": "install", "package": package_a}]) -def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requirement_is_compatible_multiple( # noqa: E501 +def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requirement_is_compatible_multiple( solver: Solver, repo: Repository, package: ProjectPackage ) -> None: set_package_python_versions(solver.provider, "~2.7 || ^3.4") @@ -2308,7 +2308,7 @@ def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requir ) -def test_solver_triggers_conflict_for_dependency_python_not_fully_compatible_with_package_python( # noqa: E501 +def test_solver_triggers_conflict_for_dependency_python_not_fully_compatible_with_package_python( solver: Solver, repo: Repository, package: ProjectPackage ) -> None: set_package_python_versions(solver.provider, "~2.7 || ^3.4") @@ -2325,7 +2325,7 @@ def test_solver_triggers_conflict_for_dependency_python_not_fully_compatible_wit solver.solve() -def test_solver_finds_compatible_package_for_dependency_python_not_fully_compatible_with_package_python( # noqa: E501 +def test_solver_finds_compatible_package_for_dependency_python_not_fully_compatible_with_package_python( solver: Solver, repo: Repository, package: ProjectPackage ) -> None: set_package_python_versions(solver.provider, "~2.7 || ^3.4") @@ -2347,7 +2347,7 @@ def test_solver_finds_compatible_package_for_dependency_python_not_fully_compati check_solver_result(transaction, [{"job": "install", "package": package_a100}]) -def test_solver_does_not_trigger_new_resolution_on_duplicate_dependencies_if_only_extras( # noqa: E501 +def test_solver_does_not_trigger_new_resolution_on_duplicate_dependencies_if_only_extras( solver: Solver, repo: Repository, package: ProjectPackage ) -> None: dep1 = Dependency.create_from_pep_508('B (>=1.0); extra == "foo"') diff --git a/tests/repositories/test_legacy_repository.py b/tests/repositories/test_legacy_repository.py index f291e54cb77..180b7b3870b 100644 --- a/tests/repositories/test_legacy_repository.py +++ b/tests/repositories/test_legacy_repository.py @@ -130,11 +130,11 @@ def _get_page(self, name: NormalizedName) -> SimpleRepositoryPage: assert package.files == [ { "file": "pytest-3.5.0-py2.py3-none-any.whl", - "hash": "sha256:6266f87ab64692112e5477eba395cfedda53b1933ccd29478e671e73b420c19c", # noqa: E501 + "hash": "sha256:6266f87ab64692112e5477eba395cfedda53b1933ccd29478e671e73b420c19c", }, { "file": "pytest-3.5.0.tar.gz", - "hash": "sha256:fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1", # noqa: E501 + "hash": "sha256:fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1", }, ] @@ -383,11 +383,11 @@ def test_get_package_retrieves_non_sha256_hashes() -> None: expected = [ { "file": "ipython-7.5.0-py3-none-any.whl", - "hash": "sha256:78aea20b7991823f6a32d55f4e963a61590820e43f666ad95ad07c7f0c704efa", # noqa: E501 + "hash": "sha256:78aea20b7991823f6a32d55f4e963a61590820e43f666ad95ad07c7f0c704efa", }, { "file": "ipython-7.5.0.tar.gz", - "hash": "sha256:e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26", # noqa: E501 + "hash": "sha256:e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26", }, ] @@ -406,11 +406,11 @@ def test_get_package_retrieves_non_sha256_hashes_mismatching_known_hash() -> Non }, { "file": "ipython-5.7.0-py3-none-any.whl", - "hash": "sha256:fc0464e68f9c65cd8c453474b4175432cc29ecb6c83775baedf6dbfcee9275ab", # noqa: E501 + "hash": "sha256:fc0464e68f9c65cd8c453474b4175432cc29ecb6c83775baedf6dbfcee9275ab", }, { "file": "ipython-5.7.0.tar.gz", - "hash": "sha256:8db43a7fb7619037c98626613ff08d03dda9d5d12c84814a4504c78c0da8323c", # noqa: E501 + "hash": "sha256:8db43a7fb7619037c98626613ff08d03dda9d5d12c84814a4504c78c0da8323c", }, ] @@ -425,7 +425,7 @@ def test_get_package_retrieves_packages_with_no_hashes() -> None: assert [ { "file": "jupyter-1.0.0.tar.gz", - "hash": "sha256:d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f", # noqa: E501 + "hash": "sha256:d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f", } ] == package.files diff --git a/tests/repositories/test_pypi_repository.py b/tests/repositories/test_pypi_repository.py index c2f56943b5c..9169430729e 100644 --- a/tests/repositories/test_pypi_repository.py +++ b/tests/repositories/test_pypi_repository.py @@ -137,11 +137,11 @@ def test_package() -> None: assert package.files == [ { "file": "requests-2.18.4-py2.py3-none-any.whl", - "hash": "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b", # noqa: E501 + "hash": "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b", }, { "file": "requests-2.18.4.tar.gz", - "hash": "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e", # noqa: E501 + "hash": "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e", }, ] diff --git a/tests/utils/test_cache.py b/tests/utils/test_cache.py index fb8e6f33d2d..af125d0c7d1 100644 --- a/tests/utils/test_cache.py +++ b/tests/utils/test_cache.py @@ -121,7 +121,7 @@ def test_missing_cache_file(poetry_file_cache: FileCache[Any]) -> None: key1_path = ( poetry_file_cache.path - / "81/74/09/96/87/a2/66/21/8174099687a26621f4e2cdd7cc03b3dacedb3fb962255b1aafd033cabe831530" # noqa: E501 + / "81/74/09/96/87/a2/66/21/8174099687a26621f4e2cdd7cc03b3dacedb3fb962255b1aafd033cabe831530" ) assert key1_path.exists() key1_path.unlink() # corrupt cache by removing a key file @@ -159,7 +159,7 @@ def test_detect_corrupted_cache_key_file( key1_path = ( poetry_file_cache.path - / "81/74/09/96/87/a2/66/21/8174099687a26621f4e2cdd7cc03b3dacedb3fb962255b1aafd033cabe831530" # noqa: E501 + / "81/74/09/96/87/a2/66/21/8174099687a26621f4e2cdd7cc03b3dacedb3fb962255b1aafd033cabe831530" ) assert key1_path.exists() diff --git a/tests/utils/test_env.py b/tests/utils/test_env.py index dafd9af4c08..26a0f0ce3db 100644 --- a/tests/utils/test_env.py +++ b/tests/utils/test_env.py @@ -1124,7 +1124,7 @@ def test_run_python_script_only_stdout(tmp_path: Path, tmp_venv: VirtualEnv) -> assert "some warning" not in output -def test_create_venv_tries_to_find_a_compatible_python_executable_using_generic_ones_first( # noqa: E501 +def test_create_venv_tries_to_find_a_compatible_python_executable_using_generic_ones_first( manager: EnvManager, poetry: Poetry, config: Config, diff --git a/tests/utils/test_helpers.py b/tests/utils/test_helpers.py index 115053688ef..bf69bea7f44 100644 --- a/tests/utils/test_helpers.py +++ b/tests/utils/test_helpers.py @@ -59,11 +59,11 @@ def test_parse_requires() -> None: "msgpack-python>=0.5.0.0,<0.6.0.0", "pyparsing>=2.2.0.0,<3.0.0.0", "requests-toolbelt>=0.8.0.0,<0.9.0.0", - 'typing>=3.6.0.0,<4.0.0.0 ; (python_version >= "2.7.0.0" and python_version < "2.8.0.0") or (python_version >= "3.4.0.0" and python_version < "3.5.0.0")', # noqa: E501 - 'virtualenv>=15.2.0.0,<16.0.0.0 ; python_version >= "2.7.0.0" and python_version < "2.8.0.0"', # noqa: E501 - 'pathlib2>=2.3.0.0,<3.0.0.0 ; python_version >= "2.7.0.0" and python_version < "2.8.0.0"', # noqa: E501 - 'zipfile36>=0.1.0.0,<0.2.0.0 ; python_version >= "3.4.0.0" and python_version < "3.6.0.0"', # noqa: E501 - 'isort@ git+git://github.com/timothycrosley/isort.git@e63ae06ec7d70b06df9e528357650281a3d3ec22#egg=isort ; extra == "dev"', # noqa: E501 + 'typing>=3.6.0.0,<4.0.0.0 ; (python_version >= "2.7.0.0" and python_version < "2.8.0.0") or (python_version >= "3.4.0.0" and python_version < "3.5.0.0")', + 'virtualenv>=15.2.0.0,<16.0.0.0 ; python_version >= "2.7.0.0" and python_version < "2.8.0.0"', + 'pathlib2>=2.3.0.0,<3.0.0.0 ; python_version >= "2.7.0.0" and python_version < "2.8.0.0"', + 'zipfile36>=0.1.0.0,<0.2.0.0 ; python_version >= "3.4.0.0" and python_version < "3.6.0.0"', + 'isort@ git+git://github.com/timothycrosley/isort.git@e63ae06ec7d70b06df9e528357650281a3d3ec22#egg=isort ; extra == "dev"', ] # fmt: on assert result == expected @@ -80,7 +80,7 @@ def test_default_hash(fixture_dir: FixtureDirGetter) -> None: ("sha224", "d26bd24163fe91c16b4b0162e773514beab77b76114d9faf6a31e350"), ( "sha3_512", - "196f4af9099185054ed72ca1d4c57707da5d724df0af7c3dfcc0fd018b0e0533908e790a291600c7d196fe4411b4f5f6db45213fe6e5cd5512bf18b2e9eff728", # noqa: E501 + "196f4af9099185054ed72ca1d4c57707da5d724df0af7c3dfcc0fd018b0e0533908e790a291600c7d196fe4411b4f5f6db45213fe6e5cd5512bf18b2e9eff728", ), ( "blake2s", @@ -88,11 +88,11 @@ def test_default_hash(fixture_dir: FixtureDirGetter) -> None: ), ( "sha3_384", - "787264d7885a0c305d2ee4daecfff435d11818399ef96cacef7e7c6bb638ce475f630d39fdd2800ca187dcd0071dc410", # noqa: E501 + "787264d7885a0c305d2ee4daecfff435d11818399ef96cacef7e7c6bb638ce475f630d39fdd2800ca187dcd0071dc410", ), ( "blake2b", - "077a34e8252c8f6776bddd0d34f321cc52762cb4c11a1c7aa9b6168023f1722caf53c9f029074a6eb990a8de341d415dd986293bc2a2fccddad428be5605696e", # noqa: E501 + "077a34e8252c8f6776bddd0d34f321cc52762cb4c11a1c7aa9b6168023f1722caf53c9f029074a6eb990a8de341d415dd986293bc2a2fccddad428be5605696e", ), ( "sha256", @@ -100,11 +100,11 @@ def test_default_hash(fixture_dir: FixtureDirGetter) -> None: ), ( "sha512", - "766ecf369b6bdf801f6f7bbfe23923cc9793d633a55619472cd3d5763f9154711fbf57c8b6ca74e4a82fa9bd8380af831e7b8668e68e362669fc60b1d81d79ad", # noqa: E501 + "766ecf369b6bdf801f6f7bbfe23923cc9793d633a55619472cd3d5763f9154711fbf57c8b6ca74e4a82fa9bd8380af831e7b8668e68e362669fc60b1d81d79ad", ), ( "sha384", - "c638f32460f318035e4600284ba64fb531630740aebd33885946e527002d742787ff09eb65fd81bc34ce5ff5ef11cfe8", # noqa: E501 + "c638f32460f318035e4600284ba64fb531630740aebd33885946e527002d742787ff09eb65fd81bc34ce5ff5ef11cfe8", ), ("sha3_224", "72980fc7bdf8c4d34268dc469442b09e1ccd2a8ff390954fc4d55a5a"), ("sha1", "91b585bd38f72d7ceedb07d03f94911b772fdc4c"), From b963eb784512fae678b5186ab81636c70785f871 Mon Sep 17 00:00:00 2001 From: David Hotham Date: Sat, 28 Oct 2023 12:36:57 +0100 Subject: [PATCH 2/2] update black --- .pre-commit-config.yaml | 3 ++- pyproject.toml | 5 +---- src/poetry/utils/authenticator.py | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0c429bbfc0e..c7916fd138d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,9 +21,10 @@ repos: - id: check-docstring-first - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.9.1 + rev: 23.10.1 hooks: - id: black + exclude: tests/([^/]*/)*fixtures/ - repo: https://github.com/pre-commit/pre-commit rev: v3.4.0 diff --git a/pyproject.toml b/pyproject.toml index a2ed3c5c8e4..26c8a591ff2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -142,10 +142,7 @@ required-imports = ["from __future__ import annotations"] [tool.black] target-version = ['py38'] preview = true -force-exclude = ''' -.*/setup\.py$ -''' - +extend-exclude = "tests/([^/]*/)*fixtures/" [tool.mypy] files = "src, tests" diff --git a/src/poetry/utils/authenticator.py b/src/poetry/utils/authenticator.py index 23b52df97dc..e181f2018ca 100644 --- a/src/poetry/utils/authenticator.py +++ b/src/poetry/utils/authenticator.py @@ -117,9 +117,9 @@ def __init__( self._sessions_for_netloc: dict[str, requests.Session] = {} self._credentials: dict[str, HTTPAuthCredential] = {} self._certs: dict[str, RepositoryCertificateConfig] = {} - self._configured_repositories: dict[ - str, AuthenticatorRepositoryConfig - ] | None = None + self._configured_repositories: ( + dict[str, AuthenticatorRepositoryConfig] | None + ) = None self._password_manager = PasswordManager(self._config) self._cache_control = ( FileCache(