Commit d5f83fff by Randy Döring

installer: fix content of `direct_url.json` for editable installs from git (#7473)

parent fd706c8c
...@@ -653,7 +653,8 @@ class Executor: ...@@ -653,7 +653,8 @@ class Executor:
) )
archive = self._prepare_archive(operation, output_dir=output_dir) archive = self._prepare_archive(operation, output_dir=output_dir)
package._source_url = original_url if not package.develop:
package._source_url = original_url
if output_dir is not None and output_dir.is_dir(): if output_dir is not None and output_dir.is_dir():
# Mark directories with cached git packages, to distinguish from # Mark directories with cached git packages, to distinguish from
...@@ -893,12 +894,12 @@ class Executor: ...@@ -893,12 +894,12 @@ class Executor:
url_reference: dict[str, Any] | None = None url_reference: dict[str, Any] | None = None
if package.source_type == "git": if package.source_type == "git" and not package.develop:
url_reference = self._create_git_url_reference(package) url_reference = self._create_git_url_reference(package)
elif package.source_type in ("directory", "git"):
url_reference = self._create_directory_url_reference(package)
elif package.source_type == "url": elif package.source_type == "url":
url_reference = self._create_url_url_reference(package) url_reference = self._create_url_url_reference(package)
elif package.source_type == "directory":
url_reference = self._create_directory_url_reference(package)
elif package.source_type == "file": elif package.source_type == "file":
url_reference = self._create_file_url_reference(package) url_reference = self._create_file_url_reference(package)
......
...@@ -1058,12 +1058,8 @@ def test_executor_should_write_pep610_url_references_for_editable_git( ...@@ -1058,12 +1058,8 @@ def test_executor_should_write_pep610_url_references_for_editable_git(
tmp_venv, tmp_venv,
package, package,
{ {
"vcs_info": { "dir_info": {"editable": True},
"vcs": "git", "url": Path(package.source_url).as_uri(),
"requested_revision": "master",
"commit_id": "123456",
},
"url": package.source_url,
}, },
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment