diff --git a/piptools/utils.py b/piptools/utils.py index 402175347..fdfba40e7 100644 --- a/piptools/utils.py +++ b/piptools/utils.py @@ -155,7 +155,9 @@ def _build_direct_reference_best_efforts(ireq: InstallRequirement) -> str: # If we get here then we have a requirement that supports direct reference. # We need to remove the egg if it exists and keep the rest of the fragments. - direct_reference = f"{ireq.name.lower()} @ {ireq.link.url_without_fragment}" + lowered_ireq_name = canonicalize_name(ireq.name) + extras = f"[{','.join(sorted(ireq.extras))}]" if ireq.extras else "" + direct_reference = f"{lowered_ireq_name}{extras} @ {ireq.link.url_without_fragment}" fragments = [] # Check if there is any fragment to add to the URI. diff --git a/tests/test_cli_compile.py b/tests/test_cli_compile.py index ac75927ea..498b4a80b 100644 --- a/tests/test_cli_compile.py +++ b/tests/test_cli_compile.py @@ -779,7 +779,10 @@ def test_direct_reference_with_extras(runner): ) out = runner.invoke(cli, ["-n", "--rebuild", "--no-build-isolation"]) assert out.exit_code == 0 - assert "pip-tools @ git+https://github.com/jazzband/pip-tools@6.2.0" in out.stderr + assert ( + "pip-tools[coverage,testing] @ git+https://github.com/jazzband/pip-tools@6.2.0" + in out.stderr + ) assert "pytest==" in out.stderr assert "pytest-cov==" in out.stderr @@ -2955,7 +2958,7 @@ def test_compile_recursive_extras(runner, tmp_path, current_resolver): os.fspath(tmp_path / "pyproject.toml"), ], ) - expected = rf"""foo @ {tmp_path.as_uri()} + expected = rf"""foo[footest] @ {tmp_path.as_uri()} small-fake-a==0.2 small-fake-b==0.3 """ diff --git a/tests/test_utils.py b/tests/test_utils.py index c549a0b71..c89461fe0 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -79,6 +79,11 @@ def test_format_requirement(from_line): "example @ https://example.com/example.zip?egg=test", id="direct reference with egg in query", ), + pytest.param( + "example[b,c,a] @ https://example.com/example.zip", + "example[a,b,c] @ https://example.com/example.zip", + id="direct reference with optional dependency", + ), pytest.param( "file:./vendor/package.zip", "file:./vendor/package.zip",