mirror of
https://github.com/astral-sh/uv.git
synced 2025-07-07 13:25:00 +00:00
Merge 655848c971 into f609e1ddaf
This commit is contained in:
Zanie Blue
GitHub
commit
792647a4da
6 changed files with 218 additions and 242 deletions
|
|
@ -818,7 +818,7 @@ fn compile_pyproject_toml_poetry() -> Result<()> {
|
|||
let pyproject_toml = context.temp_dir.child("pyproject.toml");
|
||||
pyproject_toml.write_str(
|
||||
r#"[tool.poetry]
|
||||
name = "poetry-editable"
|
||||
name = "flit-editable"
|
||||
version = "0.1.0"
|
||||
description = ""
|
||||
authors = ["Astral Software Inc. <hey@astral.sh>"]
|
||||
|
|
@ -847,7 +847,7 @@ build-backend = "poetry.core.masonry.api"
|
|||
# This file was autogenerated by uv via the following command:
|
||||
# uv pip compile --cache-dir [CACHE_DIR] pyproject.toml --extra test
|
||||
anyio==3.7.1
|
||||
# via poetry-editable (pyproject.toml)
|
||||
# via flit-editable (pyproject.toml)
|
||||
idna==3.6
|
||||
# via anyio
|
||||
iniconfig==2.0.0
|
||||
|
|
@ -857,7 +857,7 @@ build-backend = "poetry.core.masonry.api"
|
|||
pluggy==1.4.0
|
||||
# via pytest
|
||||
pytest==8.1.1
|
||||
# via poetry-editable (pyproject.toml)
|
||||
# via flit-editable (pyproject.toml)
|
||||
sniffio==1.3.1
|
||||
# via anyio
|
||||
|
||||
|
|
@ -877,13 +877,13 @@ fn compile_pyproject_toml_poetry_empty_dependencies() -> Result<()> {
|
|||
let pyproject_toml = context.temp_dir.child("pyproject.toml");
|
||||
pyproject_toml.write_str(
|
||||
r#"[project]
|
||||
name = "poetry-editable"
|
||||
name = "flit-editable"
|
||||
version = "0.1.0"
|
||||
description = ""
|
||||
authors = ["Astral Software Inc. <hey@astral.sh>"]
|
||||
|
||||
[tool.poetry]
|
||||
name = "poetry-editable"
|
||||
name = "flit-editable"
|
||||
version = "0.1.0"
|
||||
description = ""
|
||||
authors = ["Astral Software Inc. <hey@astral.sh>"]
|
||||
|
|
@ -906,7 +906,7 @@ build-backend = "poetry.core.masonry.api"
|
|||
# This file was autogenerated by uv via the following command:
|
||||
# uv pip compile --cache-dir [CACHE_DIR] pyproject.toml
|
||||
anyio==3.7.1
|
||||
# via poetry-editable (pyproject.toml)
|
||||
# via flit-editable (pyproject.toml)
|
||||
idna==3.6
|
||||
# via anyio
|
||||
sniffio==1.3.1
|
||||
|
|
@ -928,13 +928,13 @@ fn compile_pyproject_toml_poetry_invalid_dependencies() -> Result<()> {
|
|||
let pyproject_toml = context.temp_dir.child("pyproject.toml");
|
||||
pyproject_toml.write_str(
|
||||
r#"[project]
|
||||
name = "poetry-editable"
|
||||
name = "flit-editable"
|
||||
version = "0.1.0"
|
||||
description = ""
|
||||
authors = ["Astral Software Inc. <hey@astral.sh>"]
|
||||
|
||||
[tool.poetry]
|
||||
name = "poetry-editable"
|
||||
name = "flit-editable"
|
||||
version = "0.1.0"
|
||||
description = ""
|
||||
authors = ["Astral Software Inc. <hey@astral.sh>"]
|
||||
|
|
@ -4571,6 +4571,7 @@ fn compile_editable() -> Result<()> {
|
|||
let context = TestContext::new("3.12");
|
||||
let requirements_in = context.temp_dir.child("requirements.in");
|
||||
requirements_in.write_str(indoc! {r"
|
||||
-e ../../scripts/packages/flit_editable
|
||||
-e ../../scripts/packages/poetry_editable
|
||||
-e file://../../scripts/packages/black_editable[dev]
|
||||
boltons # normal dependency for comparison
|
||||
|
|
@ -4579,12 +4580,14 @@ fn compile_editable() -> Result<()> {
|
|||
|
||||
uv_snapshot!(context.filters(), context.pip_compile()
|
||||
.arg(requirements_in.path())
|
||||
.current_dir(current_dir()?), @r###"
|
||||
.current_dir(current_dir()?), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
# This file was autogenerated by uv via the following command:
|
||||
# uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in
|
||||
-e ../../scripts/packages/flit_editable
|
||||
# via -r [TEMP_DIR]/requirements.in
|
||||
-e ../../scripts/packages/poetry_editable
|
||||
# via -r [TEMP_DIR]/requirements.in
|
||||
-e file://../../scripts/packages/black_editable
|
||||
|
|
@ -4619,8 +4622,8 @@ fn compile_editable() -> Result<()> {
|
|||
# via aiohttp
|
||||
|
||||
----- stderr -----
|
||||
Resolved 13 packages in [TIME]
|
||||
"###);
|
||||
Resolved 14 packages in [TIME]
|
||||
");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -5102,7 +5105,7 @@ fn generate_hashes_local_directory() -> Result<()> {
|
|||
uv_snapshot!(context.filters(), context.pip_compile()
|
||||
.arg(requirements_in.path())
|
||||
.arg("--generate-hashes")
|
||||
.current_dir(current_dir()?), @r###"
|
||||
.current_dir(current_dir()?), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
|
@ -5125,7 +5128,7 @@ fn generate_hashes_local_directory() -> Result<()> {
|
|||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
"###);
|
||||
");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -5145,7 +5148,7 @@ fn generate_hashes_editable() -> Result<()> {
|
|||
uv_snapshot!(context.filters(), context.pip_compile()
|
||||
.arg(requirements_in.path())
|
||||
.arg("--generate-hashes")
|
||||
.current_dir(current_dir()?), @r###"
|
||||
.current_dir(current_dir()?), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
|
@ -5168,7 +5171,7 @@ fn generate_hashes_editable() -> Result<()> {
|
|||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
"###);
|
||||
");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -11444,7 +11447,7 @@ fn unnamed_path_requirement() -> Result<()> {
|
|||
let context = TestContext::new("3.12");
|
||||
let requirements_in = context.temp_dir.child("requirements.in");
|
||||
requirements_in.write_str(indoc! {r"
|
||||
../../scripts/packages/poetry_editable
|
||||
../../scripts/packages/flit_editable
|
||||
../../scripts/packages/black_editable
|
||||
../../scripts/packages/setup_py_editable
|
||||
../../scripts/packages/setup_cfg_editable
|
||||
|
|
@ -11453,16 +11456,14 @@ fn unnamed_path_requirement() -> Result<()> {
|
|||
|
||||
uv_snapshot!(context.filters(), context.pip_compile()
|
||||
.arg(requirements_in.path())
|
||||
.current_dir(current_dir()?), @r###"
|
||||
.current_dir(current_dir()?), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
# This file was autogenerated by uv via the following command:
|
||||
# uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in
|
||||
anyio==4.3.0
|
||||
# via
|
||||
# httpx
|
||||
# poetry-editable
|
||||
# via httpx
|
||||
../../scripts/packages/black_editable
|
||||
# via -r [TEMP_DIR]/requirements.in
|
||||
certifi==2024.2.2
|
||||
|
|
@ -11472,6 +11473,8 @@ fn unnamed_path_requirement() -> Result<()> {
|
|||
# requests
|
||||
charset-normalizer==3.3.2
|
||||
# via requests
|
||||
../../scripts/packages/flit_editable
|
||||
# via -r [TEMP_DIR]/requirements.in
|
||||
h11==0.14.0
|
||||
# via httpcore
|
||||
httpcore==1.0.4
|
||||
|
|
@ -11483,8 +11486,6 @@ fn unnamed_path_requirement() -> Result<()> {
|
|||
# anyio
|
||||
# httpx
|
||||
# requests
|
||||
../../scripts/packages/poetry_editable
|
||||
# via -r [TEMP_DIR]/requirements.in
|
||||
requests==2.31.0
|
||||
# via setup-cfg-editable
|
||||
../../scripts/packages/setup_cfg_editable
|
||||
|
|
@ -11500,7 +11501,7 @@ fn unnamed_path_requirement() -> Result<()> {
|
|||
|
||||
----- stderr -----
|
||||
Resolved 14 packages in [TIME]
|
||||
"###);
|
||||
");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -13201,7 +13202,7 @@ fn tool_uv_sources() -> Result<()> {
|
|||
dependencies = [
|
||||
"tqdm>4,<=5",
|
||||
"packaging @ git+https://github.com/pypa/packaging@32deafe8668a2130a3366b98154914d188f3718e",
|
||||
"poetry_editable",
|
||||
"flit_editable",
|
||||
"urllib3 @ https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl",
|
||||
]
|
||||
|
||||
|
|
@ -13216,52 +13217,46 @@ fn tool_uv_sources() -> Result<()> {
|
|||
[tool.uv.sources]
|
||||
tqdm = { url = "https://files.pythonhosted.org/packages/a5/d6/502a859bac4ad5e274255576cd3e15ca273cdb91731bc39fb840dd422ee9/tqdm-4.66.0-py3-none-any.whl" }
|
||||
boltons = { git = "https://github.com/mahmoud/boltons", rev = "57fbaa9b673ed85b32458b31baeeae230520e4a0" }
|
||||
poetry_editable = { path = "../poetry_editable", editable = true }
|
||||
flit_editable = { path = "../flit_editable", editable = true }
|
||||
"#})?;
|
||||
|
||||
let project_root = fs_err::canonicalize(current_dir()?.join("../.."))?;
|
||||
fs_err::create_dir_all(context.temp_dir.join("poetry_editable/poetry_editable"))?;
|
||||
fs_err::create_dir_all(context.temp_dir.join("flit_editable/flit_editable"))?;
|
||||
fs_err::copy(
|
||||
project_root.join("scripts/packages/poetry_editable/pyproject.toml"),
|
||||
context.temp_dir.join("poetry_editable/pyproject.toml"),
|
||||
project_root.join("scripts/packages/flit_editable/pyproject.toml"),
|
||||
context.temp_dir.join("flit_editable/pyproject.toml"),
|
||||
)?;
|
||||
fs_err::copy(
|
||||
project_root.join("scripts/packages/poetry_editable/poetry_editable/__init__.py"),
|
||||
project_root.join("scripts/packages/flit_editable/flit_editable/__init__.py"),
|
||||
context
|
||||
.temp_dir
|
||||
.join("poetry_editable/poetry_editable/__init__.py"),
|
||||
.join("flit_editable/flit_editable/__init__.py"),
|
||||
)?;
|
||||
|
||||
// Install the editable packages.
|
||||
uv_snapshot!(context.filters(), context.pip_compile()
|
||||
.arg(require_path)
|
||||
.arg("--extra")
|
||||
.arg("utils"), @r###"
|
||||
.arg("utils"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
# This file was autogenerated by uv via the following command:
|
||||
# uv pip compile --cache-dir [CACHE_DIR] some_dir/pyproject.toml --extra utils
|
||||
-e ../poetry_editable
|
||||
-e ../flit_editable
|
||||
# via project (some_dir/pyproject.toml)
|
||||
anyio==4.3.0
|
||||
# via poetry-editable
|
||||
boltons @ git+https://github.com/mahmoud/boltons@57fbaa9b673ed85b32458b31baeeae230520e4a0
|
||||
# via project (some_dir/pyproject.toml)
|
||||
idna==3.6
|
||||
# via anyio
|
||||
packaging @ git+https://github.com/pypa/packaging@32deafe8668a2130a3366b98154914d188f3718e
|
||||
# via project (some_dir/pyproject.toml)
|
||||
sniffio==1.3.1
|
||||
# via anyio
|
||||
tqdm @ https://files.pythonhosted.org/packages/a5/d6/502a859bac4ad5e274255576cd3e15ca273cdb91731bc39fb840dd422ee9/tqdm-4.66.0-py3-none-any.whl
|
||||
# via project (some_dir/pyproject.toml)
|
||||
urllib3 @ https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl
|
||||
# via project (some_dir/pyproject.toml)
|
||||
|
||||
----- stderr -----
|
||||
Resolved 8 packages in [TIME]
|
||||
"###
|
||||
Resolved 5 packages in [TIME]
|
||||
"
|
||||
);
|
||||
|
||||
Ok(())
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ fn freeze_with_editable() -> Result<()> {
|
|||
"anyio\n-e {}",
|
||||
context
|
||||
.workspace_root
|
||||
.join("scripts/packages/poetry_editable")
|
||||
.join("scripts/packages/flit_editable")
|
||||
.display()
|
||||
))?;
|
||||
|
||||
|
|
@ -149,7 +149,7 @@ fn freeze_with_editable() -> Result<()> {
|
|||
exit_code: 0
|
||||
----- stdout -----
|
||||
anyio==4.3.0
|
||||
-e file://[WORKSPACE]/scripts/packages/poetry_editable
|
||||
-e file://[WORKSPACE]/scripts/packages/flit_editable
|
||||
|
||||
----- stderr -----
|
||||
warning: The package `anyio` requires `idna>=2.8`, but it's not installed
|
||||
|
|
|
|||
|
|
@ -741,7 +741,7 @@ fn install_pyproject_toml_poetry() -> Result<()> {
|
|||
let pyproject_toml = context.temp_dir.child("pyproject.toml");
|
||||
pyproject_toml.write_str(
|
||||
r#"[tool.poetry]
|
||||
name = "poetry-editable"
|
||||
name = "poetry-example"
|
||||
version = "0.1.0"
|
||||
description = ""
|
||||
authors = ["Astral Software Inc. <hey@astral.sh>"]
|
||||
|
|
@ -1214,7 +1214,7 @@ fn install_extras() -> Result<()> {
|
|||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("--all-extras")
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r###"
|
||||
success: false
|
||||
exit_code: 2
|
||||
----- stdout -----
|
||||
|
|
@ -1227,7 +1227,7 @@ fn install_extras() -> Result<()> {
|
|||
// Request extras for a source tree
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("--all-extras")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r###"
|
||||
success: false
|
||||
exit_code: 2
|
||||
----- stdout -----
|
||||
|
|
@ -1287,6 +1287,68 @@ dependencies = ["anyio==3.7.0"]
|
|||
fn install_editable() {
|
||||
let context = TestContext::new("3.12");
|
||||
|
||||
// Install the editable package.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
// Install it again.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Uninstalled 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
~ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
// Add another, non-editable dependency.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable"))
|
||||
.arg("black"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 7 packages in [TIME]
|
||||
Prepared 7 packages in [TIME]
|
||||
Uninstalled 1 package in [TIME]
|
||||
Installed 7 packages in [TIME]
|
||||
+ black==24.3.0
|
||||
+ click==8.1.7
|
||||
~ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
+ mypy-extensions==1.0.0
|
||||
+ packaging==24.0
|
||||
+ pathspec==0.12.1
|
||||
+ platformdirs==4.2.0
|
||||
"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn install_editable_poetry() {
|
||||
let context = TestContext::new("3.12");
|
||||
|
||||
// Install the editable package.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
|
|
@ -1322,30 +1384,6 @@ fn install_editable() {
|
|||
~ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
"###
|
||||
);
|
||||
|
||||
// Add another, non-editable dependency.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable"))
|
||||
.arg("black"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 10 packages in [TIME]
|
||||
Prepared 7 packages in [TIME]
|
||||
Uninstalled 1 package in [TIME]
|
||||
Installed 7 packages in [TIME]
|
||||
+ black==24.3.0
|
||||
+ click==8.1.7
|
||||
+ mypy-extensions==1.0.0
|
||||
+ packaging==24.0
|
||||
+ pathspec==0.12.1
|
||||
+ platformdirs==4.2.0
|
||||
~ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
"###
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -7610,7 +7648,7 @@ fn tool_uv_sources() -> Result<()> {
|
|||
dependencies = [
|
||||
"tqdm>4,<=5",
|
||||
"packaging @ git+https://github.com/pypa/packaging@32deafe8668a2130a3366b98154914d188f3718e",
|
||||
"poetry_editable",
|
||||
"flit_editable",
|
||||
"urllib3 @ https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl",
|
||||
# Windows consistency
|
||||
"colorama>0.4,<5",
|
||||
|
|
@ -7627,20 +7665,20 @@ fn tool_uv_sources() -> Result<()> {
|
|||
[tool.uv.sources]
|
||||
tqdm = { url = "https://files.pythonhosted.org/packages/a5/d6/502a859bac4ad5e274255576cd3e15ca273cdb91731bc39fb840dd422ee9/tqdm-4.66.0-py3-none-any.whl" }
|
||||
charset-normalizer = { git = "https://github.com/jawah/charset_normalizer", rev = "ffdf7f5f08beb0ceb92dc0637e97382ba27cecfa" }
|
||||
poetry_editable = { path = "../poetry_editable", editable = true }
|
||||
flit_editable = { path = "../flit_editable", editable = true }
|
||||
"#})?;
|
||||
|
||||
let project_root = fs_err::canonicalize(std::env::current_dir()?.join("../.."))?;
|
||||
fs_err::create_dir_all(context.temp_dir.join("poetry_editable/poetry_editable"))?;
|
||||
fs_err::create_dir_all(context.temp_dir.join("flit_editable/flit_editable"))?;
|
||||
fs_err::copy(
|
||||
project_root.join("scripts/packages/poetry_editable/pyproject.toml"),
|
||||
context.temp_dir.join("poetry_editable/pyproject.toml"),
|
||||
project_root.join("scripts/packages/flit_editable/pyproject.toml"),
|
||||
context.temp_dir.join("flit_editable/pyproject.toml"),
|
||||
)?;
|
||||
fs_err::copy(
|
||||
project_root.join("scripts/packages/poetry_editable/poetry_editable/__init__.py"),
|
||||
project_root.join("scripts/packages/flit_editable/flit_editable/__init__.py"),
|
||||
context
|
||||
.temp_dir
|
||||
.join("poetry_editable/poetry_editable/__init__.py"),
|
||||
.join("flit_editable/flit_editable/__init__.py"),
|
||||
)?;
|
||||
|
||||
// Install the editable packages.
|
||||
|
|
@ -7648,25 +7686,22 @@ fn tool_uv_sources() -> Result<()> {
|
|||
.arg("-r")
|
||||
.arg(require_path)
|
||||
.arg("--extra")
|
||||
.arg("utils"), @r###"
|
||||
.arg("utils"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 9 packages in [TIME]
|
||||
Prepared 9 packages in [TIME]
|
||||
Installed 9 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
Resolved 6 packages in [TIME]
|
||||
Prepared 6 packages in [TIME]
|
||||
Installed 6 packages in [TIME]
|
||||
+ charset-normalizer==3.4.1 (from git+https://github.com/jawah/charset_normalizer@ffdf7f5f08beb0ceb92dc0637e97382ba27cecfa)
|
||||
+ colorama==0.4.6
|
||||
+ idna==3.6
|
||||
+ flit-editable==0.1.0 (from file://[TEMP_DIR]/flit_editable)
|
||||
+ packaging==24.1.dev0 (from git+https://github.com/pypa/packaging@32deafe8668a2130a3366b98154914d188f3718e)
|
||||
+ poetry-editable==0.1.0 (from file://[TEMP_DIR]/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
+ tqdm==4.66.0 (from https://files.pythonhosted.org/packages/a5/d6/502a859bac4ad5e274255576cd3e15ca273cdb91731bc39fb840dd422ee9/tqdm-4.66.0-py3-none-any.whl)
|
||||
+ urllib3==2.2.1 (from https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl)
|
||||
"###
|
||||
"
|
||||
);
|
||||
|
||||
// Re-install the editable packages.
|
||||
|
|
@ -7674,15 +7709,15 @@ fn tool_uv_sources() -> Result<()> {
|
|||
.arg("-r")
|
||||
.arg(require_path)
|
||||
.arg("--extra")
|
||||
.arg("utils"), @r###"
|
||||
.arg("utils"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 9 packages in [TIME]
|
||||
Audited 9 packages in [TIME]
|
||||
"###
|
||||
Resolved 6 packages in [TIME]
|
||||
Audited 6 packages in [TIME]
|
||||
"
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -9845,20 +9880,17 @@ fn other_sources_group() -> Result<()> {
|
|||
// and install an editable
|
||||
context = new_context()?;
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e").arg(context.workspace_root.join("scripts/packages/poetry_editable"))
|
||||
.arg("-e").arg(context.workspace_root.join("scripts/packages/flit_editable"))
|
||||
.arg("--group").arg("foo"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 5 packages in [TIME]
|
||||
Prepared 5 packages in [TIME]
|
||||
Installed 5 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
+ idna==3.6
|
||||
+ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
Resolved 2 packages in [TIME]
|
||||
Prepared 2 packages in [TIME]
|
||||
Installed 2 packages in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
+ sortedcontainers==2.4.0
|
||||
");
|
||||
|
||||
|
|
|
|||
|
|
@ -286,20 +286,17 @@ fn list_editable() {
|
|||
// Install the editable package.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
Prepared 4 packages in [TIME]
|
||||
Installed 4 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
+ idna==3.6
|
||||
+ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
"###
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
let filters = context
|
||||
|
|
@ -308,19 +305,16 @@ fn list_editable() {
|
|||
.chain(vec![(r"\-\-\-\-\-\-+.*", "[UNDERLINE]"), (" +", " ")])
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.pip_list(), @r###"
|
||||
uv_snapshot!(filters, context.pip_list(), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
Package Version Editable project location
|
||||
[UNDERLINE]
|
||||
anyio 4.3.0
|
||||
idna 3.6
|
||||
poetry-editable 0.1.0 [WORKSPACE]/scripts/packages/poetry_editable
|
||||
sniffio 1.3.1
|
||||
flit-editable 0.1.0 [WORKSPACE]/scripts/packages/flit_editable
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -332,20 +326,17 @@ fn list_editable_only() {
|
|||
// Install the editable package.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
Prepared 4 packages in [TIME]
|
||||
Installed 4 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
+ idna==3.6
|
||||
+ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
"###
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
let filters = context
|
||||
|
|
@ -361,25 +352,20 @@ fn list_editable_only() {
|
|||
----- stdout -----
|
||||
Package Version Editable project location
|
||||
[UNDERLINE]
|
||||
poetry-editable 0.1.0 [WORKSPACE]/scripts/packages/poetry_editable
|
||||
flit-editable 0.1.0 [WORKSPACE]/scripts/packages/flit_editable
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
);
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--exclude-editable"), @r###"
|
||||
.arg("--exclude-editable"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
Package Version
|
||||
[UNDERLINE]
|
||||
anyio 4.3.0
|
||||
idna 3.6
|
||||
sniffio 1.3.1
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
|
|
@ -407,20 +393,17 @@ fn list_exclude() {
|
|||
// Install the editable package.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
Prepared 4 packages in [TIME]
|
||||
Installed 4 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
+ idna==3.6
|
||||
+ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
"###
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
let filters = context
|
||||
|
|
@ -431,53 +414,40 @@ fn list_exclude() {
|
|||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--exclude")
|
||||
.arg("numpy"), @r###"
|
||||
.arg("numpy"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
Package Version Editable project location
|
||||
[UNDERLINE]
|
||||
anyio 4.3.0
|
||||
idna 3.6
|
||||
poetry-editable 0.1.0 [WORKSPACE]/scripts/packages/poetry_editable
|
||||
sniffio 1.3.1
|
||||
flit-editable 0.1.0 [WORKSPACE]/scripts/packages/flit_editable
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--exclude")
|
||||
.arg("poetry-editable"), @r###"
|
||||
.arg("flit-editable"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
Package Version
|
||||
[UNDERLINE]
|
||||
anyio 4.3.0
|
||||
idna 3.6
|
||||
sniffio 1.3.1
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--exclude")
|
||||
.arg("numpy")
|
||||
.arg("--exclude")
|
||||
.arg("poetry-editable"), @r###"
|
||||
.arg("flit-editable"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
Package Version
|
||||
[UNDERLINE]
|
||||
anyio 4.3.0
|
||||
idna 3.6
|
||||
sniffio 1.3.1
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -490,20 +460,17 @@ fn list_format_json() {
|
|||
// Install the editable package.
|
||||
uv_snapshot!(context.filters(), context.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
Prepared 4 packages in [TIME]
|
||||
Installed 4 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
+ idna==3.6
|
||||
+ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
"###
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
let filters: Vec<_> = context
|
||||
|
|
@ -513,14 +480,14 @@ fn list_format_json() {
|
|||
.collect();
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--format=json"), @r###"
|
||||
.arg("--format=json"), @r#"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
[{"name":"anyio","version":"4.3.0"},{"name":"idna","version":"3.6"},{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/scripts/packages/poetry_editable"},{"name":"sniffio","version":"1.3.1"}]
|
||||
[{"name":"flit-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/scripts/packages/flit_editable"}]
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"#
|
||||
);
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
|
|
@ -529,7 +496,7 @@ fn list_format_json() {
|
|||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
[{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/scripts/packages/poetry_editable"}]
|
||||
[{"name":"flit-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/scripts/packages/flit_editable"}]
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
|
|
@ -537,14 +504,14 @@ fn list_format_json() {
|
|||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--format=json")
|
||||
.arg("--exclude-editable"), @r###"
|
||||
.arg("--exclude-editable"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
[{"name":"anyio","version":"4.3.0"},{"name":"idna","version":"3.6"},{"name":"sniffio","version":"1.3.1"}]
|
||||
[]
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -557,20 +524,17 @@ fn list_format_freeze() {
|
|||
uv_snapshot!(context.filters(), context
|
||||
.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
Prepared 4 packages in [TIME]
|
||||
Installed 4 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
+ idna==3.6
|
||||
+ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
"###
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
let filters = context
|
||||
|
|
@ -580,17 +544,14 @@ fn list_format_freeze() {
|
|||
.collect::<Vec<_>>();
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--format=freeze"), @r###"
|
||||
.arg("--format=freeze"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
anyio==4.3.0
|
||||
idna==3.6
|
||||
poetry-editable==0.1.0
|
||||
sniffio==1.3.1
|
||||
flit-editable==0.1.0
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
|
|
@ -599,7 +560,7 @@ fn list_format_freeze() {
|
|||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
poetry-editable==0.1.0
|
||||
flit-editable==0.1.0
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
|
|
@ -607,16 +568,13 @@ fn list_format_freeze() {
|
|||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--format=freeze")
|
||||
.arg("--exclude-editable"), @r###"
|
||||
.arg("--exclude-editable"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
anyio==4.3.0
|
||||
idna==3.6
|
||||
sniffio==1.3.1
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -723,20 +681,17 @@ fn list_ignores_quiet_flag_format_freeze() {
|
|||
uv_snapshot!(context.filters(), context
|
||||
.pip_install()
|
||||
.arg("-e")
|
||||
.arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###"
|
||||
.arg(context.workspace_root.join("scripts/packages/flit_editable")), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Resolved 4 packages in [TIME]
|
||||
Prepared 4 packages in [TIME]
|
||||
Installed 4 packages in [TIME]
|
||||
+ anyio==4.3.0
|
||||
+ idna==3.6
|
||||
+ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable)
|
||||
+ sniffio==1.3.1
|
||||
"###
|
||||
Resolved 1 package in [TIME]
|
||||
Prepared 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
+ flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable)
|
||||
"
|
||||
);
|
||||
|
||||
let filters = context
|
||||
|
|
@ -747,17 +702,14 @@ fn list_ignores_quiet_flag_format_freeze() {
|
|||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--format=freeze")
|
||||
.arg("--quiet"), @r###"
|
||||
.arg("--quiet"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
anyio==4.3.0
|
||||
idna==3.6
|
||||
poetry-editable==0.1.0
|
||||
sniffio==1.3.1
|
||||
flit-editable==0.1.0
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
|
||||
uv_snapshot!(filters, context.pip_list()
|
||||
|
|
@ -767,7 +719,7 @@ fn list_ignores_quiet_flag_format_freeze() {
|
|||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
poetry-editable==0.1.0
|
||||
flit-editable==0.1.0
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
|
|
@ -776,15 +728,12 @@ fn list_ignores_quiet_flag_format_freeze() {
|
|||
uv_snapshot!(filters, context.pip_list()
|
||||
.arg("--format=freeze")
|
||||
.arg("--exclude-editable")
|
||||
.arg("--quiet"), @r###"
|
||||
.arg("--quiet"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
anyio==4.3.0
|
||||
idna==3.6
|
||||
sniffio==1.3.1
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ fn show_editable() -> Result<()> {
|
|||
context
|
||||
.pip_install()
|
||||
.arg("-e")
|
||||
.arg("../../scripts/packages/poetry_editable")
|
||||
.arg("../../scripts/packages/flit_editable")
|
||||
.current_dir(current_dir()?)
|
||||
.env(
|
||||
EnvVars::CARGO_TARGET_DIR,
|
||||
|
|
@ -394,19 +394,19 @@ fn show_editable() -> Result<()> {
|
|||
.success();
|
||||
|
||||
uv_snapshot!(context.filters(), context.pip_show()
|
||||
.arg("poetry-editable"), @r###"
|
||||
.arg("flit-editable"), @r"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
Name: poetry-editable
|
||||
Name: flit-editable
|
||||
Version: 0.1.0
|
||||
Location: [SITE_PACKAGES]/
|
||||
Editable project location: [WORKSPACE]/scripts/packages/poetry_editable
|
||||
Requires: anyio
|
||||
Editable project location: [WORKSPACE]/scripts/packages/flit_editable
|
||||
Requires:
|
||||
Required-by:
|
||||
|
||||
----- stderr -----
|
||||
"###
|
||||
"
|
||||
);
|
||||
|
||||
Ok(())
|
||||
|
|
|
|||
|
|
@ -2244,22 +2244,22 @@ fn refresh_package() -> Result<()> {
|
|||
#[test]
|
||||
fn sync_editable() -> Result<()> {
|
||||
let context = TestContext::new("3.12");
|
||||
let poetry_editable = context.temp_dir.child("poetry_editable");
|
||||
let flit_editable = context.temp_dir.child("flit_editable");
|
||||
|
||||
// Copy into the temporary directory so we can mutate it.
|
||||
copy_dir_all(
|
||||
context
|
||||
.workspace_root
|
||||
.join("scripts/packages/poetry_editable"),
|
||||
&poetry_editable,
|
||||
.join("scripts/packages/flit_editable"),
|
||||
&flit_editable,
|
||||
)?;
|
||||
|
||||
let requirements_txt = context.temp_dir.child("requirements.txt");
|
||||
requirements_txt.write_str(&indoc::formatdoc! {r"
|
||||
anyio==3.7.0
|
||||
-e file://{poetry_editable}
|
||||
-e file://{flit_editable}
|
||||
",
|
||||
poetry_editable = poetry_editable.display()
|
||||
flit_editable = flit_editable.display()
|
||||
})?;
|
||||
|
||||
// Install the editable package.
|
||||
|
|
@ -2274,7 +2274,7 @@ fn sync_editable() -> Result<()> {
|
|||
Prepared 2 packages in [TIME]
|
||||
Installed 2 packages in [TIME]
|
||||
+ anyio==3.7.0
|
||||
+ poetry-editable==0.1.0 (from file://[TEMP_DIR]/poetry_editable)
|
||||
+ flit-editable==0.1.0 (from file://[TEMP_DIR]/flit_editable)
|
||||
"###
|
||||
);
|
||||
|
||||
|
|
@ -2295,7 +2295,7 @@ fn sync_editable() -> Result<()> {
|
|||
uv_snapshot!(context.filters(), context.pip_sync()
|
||||
.arg(requirements_txt.path())
|
||||
.arg("--reinstall-package")
|
||||
.arg("poetry-editable"), @r###"
|
||||
.arg("flit-editable"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
|
@ -2305,16 +2305,16 @@ fn sync_editable() -> Result<()> {
|
|||
Prepared 1 package in [TIME]
|
||||
Uninstalled 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
~ poetry-editable==0.1.0 (from file://[TEMP_DIR]/poetry_editable)
|
||||
~ flit-editable==0.1.0 (from file://[TEMP_DIR]/flit_editable)
|
||||
"###
|
||||
);
|
||||
|
||||
let python_source_file = poetry_editable.path().join("poetry_editable/__init__.py");
|
||||
let check_installed = indoc::indoc! {r#"
|
||||
from poetry_editable import a
|
||||
let python_source_file = flit_editable.path().join("flit_editable/__init__.py");
|
||||
let check_installed = indoc::indoc! {r"
|
||||
from flit_editable import main
|
||||
|
||||
assert a() == "a", a()
|
||||
"#};
|
||||
assert main() == None
|
||||
"};
|
||||
context.assert_command(check_installed).success();
|
||||
|
||||
// Edit the sources and make sure the changes are respected without syncing again.
|
||||
|
|
@ -2324,7 +2324,7 @@ fn sync_editable() -> Result<()> {
|
|||
fs_err::write(&python_source_file, python_version_1)?;
|
||||
|
||||
let check_installed = indoc::indoc! {r"
|
||||
from poetry_editable import version
|
||||
from flit_editable import version
|
||||
|
||||
assert version == 1, version
|
||||
"};
|
||||
|
|
@ -2336,7 +2336,7 @@ fn sync_editable() -> Result<()> {
|
|||
fs_err::write(&python_source_file, python_version_2)?;
|
||||
|
||||
let check_installed = indoc::indoc! {r"
|
||||
from poetry_editable import version
|
||||
from flit_editable import version
|
||||
|
||||
assert version == 2, version
|
||||
"};
|
||||
|
|
@ -2357,7 +2357,7 @@ fn sync_editable() -> Result<()> {
|
|||
);
|
||||
|
||||
// Modify the `pyproject.toml` file.
|
||||
let pyproject_toml = poetry_editable.path().join("pyproject.toml");
|
||||
let pyproject_toml = flit_editable.path().join("pyproject.toml");
|
||||
let pyproject_toml_contents = fs_err::read_to_string(&pyproject_toml)?;
|
||||
fs_err::write(
|
||||
&pyproject_toml,
|
||||
|
|
@ -2376,13 +2376,13 @@ fn sync_editable() -> Result<()> {
|
|||
Prepared 1 package in [TIME]
|
||||
Uninstalled 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
- poetry-editable==0.1.0 (from file://[TEMP_DIR]/poetry_editable)
|
||||
+ poetry-editable==0.1.1 (from file://[TEMP_DIR]/poetry_editable)
|
||||
- flit-editable==0.1.0 (from file://[TEMP_DIR]/flit_editable)
|
||||
+ flit-editable==0.1.1 (from file://[TEMP_DIR]/flit_editable)
|
||||
"###
|
||||
);
|
||||
|
||||
// Modify the `pyproject.toml` file.
|
||||
let pyproject_toml = poetry_editable.path().join("pyproject.toml");
|
||||
let pyproject_toml = flit_editable.path().join("pyproject.toml");
|
||||
let pyproject_toml_contents = fs_err::read_to_string(&pyproject_toml)?;
|
||||
fs_err::write(
|
||||
&pyproject_toml,
|
||||
|
|
@ -2401,7 +2401,7 @@ fn sync_editable() -> Result<()> {
|
|||
Prepared 1 package in [TIME]
|
||||
Uninstalled 1 package in [TIME]
|
||||
Installed 1 package in [TIME]
|
||||
~ poetry-editable==0.1.1 (from file://[TEMP_DIR]/poetry_editable)
|
||||
~ flit-editable==0.1.1 (from file://[TEMP_DIR]/flit_editable)
|
||||
"###
|
||||
);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue