Rename scripts/editable-installs to scripts/packages (#2644)

## Summary

This was discussed in a prior PR.
This commit is contained in:
Charlie Marsh 2024-03-24 23:56:00 -04:00 committed by GitHub
parent a6602ad416
commit 1601ea08e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 122 additions and 135 deletions

View file

@ -15,12 +15,12 @@ RequirementsTxt {
password: None,
host: None,
port: None,
path: "[WORKSPACE_DIR]/scripts/editable-installs/black_editable",
path: "[WORKSPACE_DIR]/scripts/packages/black_editable",
query: None,
fragment: None,
},
given: Some(
"./scripts/editable-installs/black_editable",
"./scripts/packages/black_editable",
),
},
extras: [],
@ -41,12 +41,12 @@ RequirementsTxt {
password: None,
host: None,
port: None,
path: "[WORKSPACE_DIR]/scripts/editable-installs/black_editable",
path: "[WORKSPACE_DIR]/scripts/packages/black_editable",
query: None,
fragment: None,
},
given: Some(
"./scripts/editable-installs/black_editable",
"./scripts/packages/black_editable",
),
},
extras: [
@ -71,12 +71,12 @@ RequirementsTxt {
password: None,
host: None,
port: None,
path: "/scripts/editable-installs/black_editable",
path: "/scripts/packages/black_editable",
query: None,
fragment: None,
},
given: Some(
"file:///scripts/editable-installs/black_editable",
"file:///scripts/packages/black_editable",
),
},
extras: [],

View file

@ -15,12 +15,12 @@ RequirementsTxt {
password: None,
host: None,
port: None,
path: "/[WORKSPACE_DIR]/scripts/editable-installs/black_editable",
path: "/[WORKSPACE_DIR]/scripts/packages/black_editable",
query: None,
fragment: None,
},
given: Some(
"./scripts/editable-installs/black_editable",
"./scripts/packages/black_editable",
),
},
extras: [],
@ -41,12 +41,12 @@ RequirementsTxt {
password: None,
host: None,
port: None,
path: "/[WORKSPACE_DIR]/scripts/editable-installs/black_editable",
path: "/[WORKSPACE_DIR]/scripts/packages/black_editable",
query: None,
fragment: None,
},
given: Some(
"./scripts/editable-installs/black_editable",
"./scripts/packages/black_editable",
),
},
extras: [
@ -71,12 +71,12 @@ RequirementsTxt {
password: None,
host: None,
port: None,
path: "/[WORKSPACE_DIR]/scripts/editable-installs/black_editable",
path: "/[WORKSPACE_DIR]/scripts/packages/black_editable",
query: None,
fragment: None,
},
given: Some(
"file:///scripts/editable-installs/black_editable",
"file:///scripts/packages/black_editable",
),
},
extras: [],

View file

@ -1,3 +1,3 @@
./scripts/editable-installs/black_editable
./scripts/editable-installs/black_editable[dev]
file:///scripts/editable-installs/black_editable
./scripts/packages/black_editable
./scripts/packages/black_editable[dev]
file:///scripts/packages/black_editable

View file

@ -1496,7 +1496,7 @@ fn disallowed_transitive_url_dependency() -> Result<()> {
let requirements_in = context.temp_dir.child("requirements.in");
requirements_in.write_str("hatchling_editable @ ${HATCHLING}")?;
let hatchling_path = current_dir()?.join("../../scripts/editable-installs/hatchling_editable");
let hatchling_path = current_dir()?.join("../../scripts/packages/hatchling_editable");
uv_snapshot!(context.compile()
.arg("requirements.in")
.env("HATCHLING", hatchling_path.as_os_str()), @r###"
@ -1525,7 +1525,7 @@ fn allowed_transitive_url_dependency() -> Result<()> {
let constraints_txt = context.temp_dir.child("constraints.txt");
constraints_txt.write_str("iniconfig @ git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4")?;
let hatchling_path = current_dir()?.join("../../scripts/editable-installs/hatchling_editable");
let hatchling_path = current_dir()?.join("../../scripts/packages/hatchling_editable");
uv_snapshot!(context.compile()
.arg("requirements.in")
.arg("--constraint")
@ -1562,7 +1562,7 @@ fn allowed_transitive_canonical_url_dependency() -> Result<()> {
let constraints_txt = context.temp_dir.child("constraints.txt");
constraints_txt.write_str("iniconfig @ git+https://github.com/pytest-dev/iniconfig.git@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4")?;
let hatchling_path = current_dir()?.join("../../scripts/editable-installs/hatchling_editable");
let hatchling_path = current_dir()?.join("../../scripts/packages/hatchling_editable");
uv_snapshot!(context.compile()
.arg("requirements.in")
.arg("--constraint")
@ -2591,9 +2591,9 @@ 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/editable-installs/poetry_editable
-e ${PROJECT_ROOT}/../../scripts/editable-installs/maturin_editable
-e file://../../scripts/editable-installs/black_editable[dev]
-e ../../scripts/packages/poetry_editable
-e ${PROJECT_ROOT}/../../scripts/packages/maturin_editable
-e file://../../scripts/packages/black_editable[dev]
boltons # normal dependency for comparison
"
})?;
@ -2612,9 +2612,9 @@ fn compile_editable() -> Result<()> {
----- stdout -----
# This file was autogenerated by uv via the following command:
# uv pip compile --cache-dir [CACHE_DIR] --exclude-newer 2023-11-18T12:00:00Z requirements.in
-e ${PROJECT_ROOT}/../../scripts/editable-installs/maturin_editable
-e ../../scripts/editable-installs/poetry_editable
-e file://../../scripts/editable-installs/black_editable
-e ${PROJECT_ROOT}/../../scripts/packages/maturin_editable
-e ../../scripts/packages/poetry_editable
-e file://../../scripts/packages/black_editable
aiohttp==3.9.0
# via black
aiosignal==1.3.1
@ -2655,7 +2655,7 @@ fn compile_editable() -> Result<()> {
fn recursive_extras_direct_url() -> Result<()> {
let context = TestContext::new("3.12");
let requirements_in = context.temp_dir.child("requirements.in");
requirements_in.write_str("black[dev] @ ../../scripts/editable-installs/black_editable")?;
requirements_in.write_str("black[dev] @ ../../scripts/packages/black_editable")?;
let filter_path = regex::escape(&requirements_in.user_display().to_string());
let filters: Vec<_> = [(filter_path.as_str(), "requirements.in")]
@ -2690,7 +2690,7 @@ fn recursive_extras_direct_url() -> Result<()> {
# via aiohttp
attrs==23.1.0
# via aiohttp
black @ ../../scripts/editable-installs/black_editable
black @ ../../scripts/packages/black_editable
frozenlist==1.4.0
# via
# aiohttp
@ -2718,7 +2718,7 @@ fn recursive_extras_direct_url() -> Result<()> {
fn compile_editable_url_requirement() -> Result<()> {
let context = TestContext::new("3.12");
let requirements_in = context.temp_dir.child("requirements.in");
requirements_in.write_str("-e ../../scripts/editable-installs/hatchling_editable")?;
requirements_in.write_str("-e ../../scripts/packages/hatchling_editable")?;
let filter_path = regex::escape(&requirements_in.user_display().to_string());
let filters: Vec<_> = [(filter_path.as_str(), "requirements.in")]
@ -2734,7 +2734,7 @@ fn compile_editable_url_requirement() -> Result<()> {
----- stdout -----
# This file was autogenerated by uv via the following command:
# uv pip compile --cache-dir [CACHE_DIR] --exclude-newer 2023-11-18T12:00:00Z requirements.in
-e ../../scripts/editable-installs/hatchling_editable
-e ../../scripts/packages/hatchling_editable
iniconfig @ git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4
# via hatchling-editable
@ -4316,7 +4316,7 @@ fn no_deps_invalid_extra() -> Result<()> {
fn editable_invalid_extra() -> Result<()> {
let context = TestContext::new("3.12");
let requirements_in = context.temp_dir.child("requirements.in");
requirements_in.write_str("-e ../../scripts/editable-installs/black_editable[empty]")?;
requirements_in.write_str("-e ../../scripts/packages/black_editable[empty]")?;
let requirements_path = regex::escape(&requirements_in.user_display().to_string());
let filters: Vec<_> = [
@ -4335,7 +4335,7 @@ fn editable_invalid_extra() -> Result<()> {
----- stdout -----
# This file was autogenerated by uv via the following command:
# uv pip compile --cache-dir [CACHE_DIR] --exclude-newer 2023-11-18T12:00:00Z requirements.in
-e ../../scripts/editable-installs/black_editable
-e ../../scripts/packages/black_editable
----- stderr -----
Built 1 editable in [TIME]
@ -4592,7 +4592,7 @@ fn editable_override() -> Result<()> {
// Add an editable override.
let overrides_txt = context.temp_dir.child("overrides.txt");
overrides_txt.write_str("-e file://../../scripts/editable-installs/black_editable")?;
overrides_txt.write_str("-e file://../../scripts/packages/black_editable")?;
uv_snapshot!(context.compile()
.arg("requirements.in")
@ -4630,7 +4630,7 @@ fn editable_override() -> Result<()> {
fn override_editable() -> Result<()> {
let context = TestContext::new("3.12");
let requirements_in = context.temp_dir.child("requirements.in");
requirements_in.write_str("-e ../../scripts/editable-installs/black_editable")?;
requirements_in.write_str("-e ../../scripts/packages/black_editable")?;
let overrides_txt = context.temp_dir.child("overrides.txt");
overrides_txt.write_str("black==23.10.1")?;
@ -4655,7 +4655,7 @@ fn override_editable() -> Result<()> {
----- stdout -----
# This file was autogenerated by uv via the following command:
# uv pip compile --cache-dir [CACHE_DIR] --exclude-newer 2023-11-18T12:00:00Z requirements.in --override overrides.txt
-e ../../scripts/editable-installs/black_editable
-e ../../scripts/packages/black_editable
----- stderr -----
Built 1 editable in [TIME]
@ -4981,7 +4981,7 @@ dev = [
fn editable_direct_dependency() -> Result<()> {
let context = TestContext::new("3.12");
let requirements_in = context.temp_dir.child("requirements.in");
requirements_in.write_str("-e ../../scripts/editable-installs/setuptools_editable")?;
requirements_in.write_str("-e ../../scripts/packages/setuptools_editable")?;
let requirements_path = regex::escape(&requirements_in.user_display().to_string());
let filters: Vec<_> = [
@ -5002,7 +5002,7 @@ fn editable_direct_dependency() -> Result<()> {
----- stdout -----
# This file was autogenerated by uv via the following command:
# uv pip compile --cache-dir [CACHE_DIR] --exclude-newer 2023-11-18T12:00:00Z requirements.in --resolution lowest-direct
-e ../../scripts/editable-installs/setuptools_editable
-e ../../scripts/packages/setuptools_editable
iniconfig==0.1
# via setuptools-editable
@ -5475,7 +5475,7 @@ fn compile_root_uri() -> Result<()> {
.chain(INSTA_FILTERS.to_vec())
.collect();
let root_path = current_dir()?.join("../../scripts/editable-installs/root_editable");
let root_path = current_dir()?.join("../../scripts/packages/root_editable");
uv_snapshot!(filters, context.compile()
.arg("requirements.in")
.env("ROOT_PATH", root_path.as_os_str()), @r###"
@ -5759,10 +5759,10 @@ 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/editable-installs/poetry_editable
../../scripts/editable-installs/black_editable
../../scripts/editable-installs/setup_py_editable
../../scripts/editable-installs/setup_cfg_editable
../../scripts/packages/poetry_editable
../../scripts/packages/black_editable
../../scripts/packages/setup_py_editable
../../scripts/packages/setup_cfg_editable
"
})?;
@ -5784,7 +5784,7 @@ fn unnamed_path_requirement() -> Result<()> {
# via
# httpx
# poetry-editable
black @ ../../scripts/editable-installs/black_editable
black @ ../../scripts/packages/black_editable
certifi==2023.11.17
# via
# httpcore
@ -5803,11 +5803,11 @@ fn unnamed_path_requirement() -> Result<()> {
# anyio
# httpx
# requests
poetry-editable @ ../../scripts/editable-installs/poetry_editable
poetry-editable @ ../../scripts/packages/poetry_editable
requests==2.31.0
# via setup-cfg-editable
setup-cfg-editable @ ../../scripts/editable-installs/setup_cfg_editable
setup-py-editable @ ../../scripts/editable-installs/setup_py_editable
setup-cfg-editable @ ../../scripts/packages/setup_cfg_editable
setup-py-editable @ ../../scripts/packages/setup_py_editable
sniffio==1.3.0
# via
# anyio

View file

@ -584,7 +584,7 @@ fn install_editable() -> Result<()> {
// Install the editable package.
uv_snapshot!(filters, command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir)
.env("CARGO_TARGET_DIR", "../../../target/target_install_editable"), @r###"
success: true
@ -598,7 +598,7 @@ fn install_editable() -> Result<()> {
Installed 4 packages in [TIME]
+ anyio==4.0.0
+ idna==3.4
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ sniffio==1.3.0
"###
);
@ -608,7 +608,7 @@ fn install_editable() -> Result<()> {
.arg("pip")
.arg("install")
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.arg("--strict")
.arg("--cache-dir")
.arg(context.cache_dir.path())
@ -630,7 +630,7 @@ fn install_editable() -> Result<()> {
.arg("pip")
.arg("install")
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.arg("black")
.arg("--strict")
.arg("--cache-dir")
@ -654,8 +654,8 @@ fn install_editable() -> Result<()> {
+ packaging==23.2
+ pathspec==0.11.2
+ platformdirs==4.0.0
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
"###
);
@ -703,7 +703,7 @@ fn install_editable_and_registry() -> Result<()> {
// Install the editable version of Black. This should remove the registry-based version.
uv_snapshot!(filters, command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/black_editable")
.arg("../../scripts/packages/black_editable")
.current_dir(&current_dir)
.env("CARGO_TARGET_DIR", "../../../target/target_install_editable"), @r###"
success: true
@ -715,7 +715,7 @@ fn install_editable_and_registry() -> Result<()> {
Resolved 1 package in [TIME]
Installed 1 package in [TIME]
- black==23.11.0
+ black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable)
+ black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/black_editable)
"###
);
@ -756,7 +756,7 @@ fn install_editable_and_registry() -> Result<()> {
Resolved 6 packages in [TIME]
Downloaded 1 package in [TIME]
Installed 1 package in [TIME]
- black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable)
- black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/black_editable)
+ black==23.10.0
"###
);
@ -783,7 +783,7 @@ fn install_editable_no_binary() -> Result<()> {
// Install the editable package with no-binary enabled
uv_snapshot!(filters, command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/black_editable")
.arg("../../scripts/packages/black_editable")
.arg("--no-binary")
.arg(":all:")
.current_dir(&current_dir)
@ -796,7 +796,7 @@ fn install_editable_no_binary() -> Result<()> {
Built 1 editable in [TIME]
Resolved 1 package in [TIME]
Installed 1 package in [TIME]
+ black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable)
+ black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/black_editable)
"###
);
@ -1843,7 +1843,7 @@ fn config_settings() -> Result<()> {
.arg("pip")
.arg("install")
.arg("-e")
.arg("../../scripts/editable-installs/setuptools_editable")
.arg("../../scripts/packages/setuptools_editable")
.arg("--cache-dir")
.arg(context.cache_dir.path())
.arg("--exclude-newer")
@ -1860,7 +1860,7 @@ fn config_settings() -> Result<()> {
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ iniconfig==2.0.0
+ setuptools-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/setuptools_editable)
+ setuptools-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/setuptools_editable)
"###
);
@ -1890,7 +1890,7 @@ fn config_settings() -> Result<()> {
.arg("pip")
.arg("install")
.arg("-e")
.arg("../../scripts/editable-installs/setuptools_editable")
.arg("../../scripts/packages/setuptools_editable")
.arg("-C")
.arg("editable_mode=compat")
.arg("--cache-dir")
@ -1909,7 +1909,7 @@ fn config_settings() -> Result<()> {
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ iniconfig==2.0.0
+ setuptools-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/setuptools_editable)
+ setuptools-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/setuptools_editable)
"###
);

View file

@ -117,7 +117,7 @@ fn list_editable() -> Result<()> {
// Install the editable package.
uv_snapshot!(filters, install_command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir)
.env("CARGO_TARGET_DIR", "../../../target/target_install_editable"), @r###"
success: true
@ -131,7 +131,7 @@ fn list_editable() -> Result<()> {
Installed 4 packages in [TIME]
+ anyio==4.0.0
+ idna==3.4
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ sniffio==1.3.0
"###
);
@ -141,23 +141,23 @@ fn list_editable() -> Result<()> {
// Origin of lengths used below:
// - |Editable project location| = 25
// - expected length = 57
// - expected length - |Editable project location| = 32
// - expected length = 48
// - expected length - |Editable project location| = 23
// - |`[WORKSPACE_DIR]/`| = 16
// - |`file://`| = 7, |`file:///`| = 8 (windows)
let workspace_len_difference = workspace_dir.as_str().len() + 32 - 16 - prefix.len();
let workspace_len_difference = workspace_dir.as_str().len() + 23 - 16 - prefix.len();
let find_divider = "-".repeat(25 + workspace_len_difference);
let replace_divider = "-".repeat(57);
let replace_divider = "-".repeat(48);
let find_header = format!(
"Editable project location{0}",
" ".repeat(workspace_len_difference)
);
let replace_header = format!("Editable project location{0}", " ".repeat(32));
let replace_header = format!("Editable project location{0}", " ".repeat(23));
let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57);
let replace_whitespace = " ".repeat(48);
let search_workspace = workspace_dir_re.as_str().strip_prefix(prefix).unwrap();
let replace_workspace = "[WORKSPACE_DIR]/";
@ -184,10 +184,10 @@ fn list_editable() -> Result<()> {
exit_code: 0
----- stdout -----
Package Version Editable project location
--------------- ------- ---------------------------------------------------------
--------------- ------- ------------------------------------------------
anyio 4.0.0
idna 3.4
poetry-editable 0.1.0 [WORKSPACE_DIR]/scripts/editable-installs/poetry_editable
poetry-editable 0.1.0 [WORKSPACE_DIR]/scripts/packages/poetry_editable
sniffio 1.3.0
----- stderr -----
@ -214,7 +214,7 @@ fn list_editable_only() -> Result<()> {
// Install the editable package.
uv_snapshot!(filters, install_command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir)
.env("CARGO_TARGET_DIR", "../../../target/target_install_editable"), @r###"
success: true
@ -228,7 +228,7 @@ fn list_editable_only() -> Result<()> {
Installed 4 packages in [TIME]
+ anyio==4.0.0
+ idna==3.4
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ sniffio==1.3.0
"###
);
@ -236,18 +236,18 @@ fn list_editable_only() -> Result<()> {
// Account for difference length workspace dir
let prefix = if cfg!(windows) { "file:///" } else { "file://" };
let workspace_len_difference = workspace_dir.as_str().len() + 32 - 16 - prefix.len();
let workspace_len_difference = workspace_dir.as_str().len() + 23 - 16 - prefix.len();
let find_divider = "-".repeat(25 + workspace_len_difference);
let replace_divider = "-".repeat(57);
let replace_divider = "-".repeat(48);
let find_header = format!(
"Editable project location{0}",
" ".repeat(workspace_len_difference)
);
let replace_header = format!("Editable project location{0}", " ".repeat(32));
let replace_header = format!("Editable project location{0}", " ".repeat(23));
let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57);
let replace_whitespace = " ".repeat(48);
let search_workspace = workspace_dir_re.as_str().strip_prefix(prefix).unwrap();
let replace_workspace = "[WORKSPACE_DIR]/";
@ -275,8 +275,8 @@ fn list_editable_only() -> Result<()> {
exit_code: 0
----- stdout -----
Package Version Editable project location
--------------- ------- ---------------------------------------------------------
poetry-editable 0.1.0 [WORKSPACE_DIR]/scripts/editable-installs/poetry_editable
--------------- ------- ------------------------------------------------
poetry-editable 0.1.0 [WORKSPACE_DIR]/scripts/packages/poetry_editable
----- stderr -----
"###
@ -340,7 +340,7 @@ fn list_exclude() -> Result<()> {
// Install the editable package.
uv_snapshot!(filters, install_command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir)
.env("CARGO_TARGET_DIR", "../../../target/target_install_editable"), @r###"
success: true
@ -354,7 +354,7 @@ fn list_exclude() -> Result<()> {
Installed 4 packages in [TIME]
+ anyio==4.0.0
+ idna==3.4
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ sniffio==1.3.0
"###
);
@ -362,18 +362,18 @@ fn list_exclude() -> Result<()> {
// Account for difference length workspace dir
let prefix = if cfg!(windows) { "file:///" } else { "file://" };
let workspace_len_difference = workspace_dir.as_str().len() + 32 - 16 - prefix.len();
let workspace_len_difference = workspace_dir.as_str().len() + 23 - 16 - prefix.len();
let find_divider = "-".repeat(25 + workspace_len_difference);
let replace_divider = "-".repeat(57);
let replace_divider = "-".repeat(48);
let find_header = format!(
"Editable project location{0}",
" ".repeat(workspace_len_difference)
);
let replace_header = format!("Editable project location{0}", " ".repeat(32));
let replace_header = format!("Editable project location{0}", " ".repeat(23));
let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57);
let replace_whitespace = " ".repeat(48);
let search_workspace = workspace_dir_re.as_str().strip_prefix(prefix).unwrap();
let replace_workspace = "[WORKSPACE_DIR]/";
@ -402,10 +402,10 @@ fn list_exclude() -> Result<()> {
exit_code: 0
----- stdout -----
Package Version Editable project location
--------------- ------- ---------------------------------------------------------
--------------- ------- ------------------------------------------------
anyio 4.0.0
idna 3.4
poetry-editable 0.1.0 [WORKSPACE_DIR]/scripts/editable-installs/poetry_editable
poetry-editable 0.1.0 [WORKSPACE_DIR]/scripts/packages/poetry_editable
sniffio 1.3.0
----- stderr -----
@ -481,7 +481,7 @@ fn list_format_json() -> Result<()> {
// Install the editable package.
uv_snapshot!(filters, install_command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir)
.env("CARGO_TARGET_DIR", "../../../target/target_install_editable"), @r###"
success: true
@ -495,7 +495,7 @@ fn list_format_json() -> Result<()> {
Installed 4 packages in [TIME]
+ anyio==4.0.0
+ idna==3.4
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ sniffio==1.3.0
"###
);
@ -509,18 +509,18 @@ fn list_format_json() -> Result<()> {
.unwrap(),
);
let workspace_len_difference = workspace_dir.as_str().len() + 32 - 16;
let workspace_len_difference = workspace_dir.as_str().len() + 23 - 16;
let find_divider = "-".repeat(25 + workspace_len_difference);
let replace_divider = "-".repeat(57);
let replace_divider = "-".repeat(48);
let find_header = format!(
"Editable project location{0}",
" ".repeat(workspace_len_difference)
);
let replace_header = format!("Editable project location{0}", " ".repeat(32));
let replace_header = format!("Editable project location{0}", " ".repeat(23));
let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57);
let replace_whitespace = " ".repeat(48);
let search_workspace = workspace_dir.as_str();
let search_workspace_escaped = search_workspace.replace('/', "\\\\");
@ -548,7 +548,7 @@ fn list_format_json() -> Result<()> {
success: true
exit_code: 0
----- stdout -----
[{"name":"anyio","version":"4.0.0"},{"name":"idna","version":"3.4"},{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable"},{"name":"sniffio","version":"1.3.0"}]
[{"name":"anyio","version":"4.0.0"},{"name":"idna","version":"3.4"},{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE_DIR]/scripts/packages/poetry_editable"},{"name":"sniffio","version":"1.3.0"}]
----- stderr -----
"###
@ -566,7 +566,7 @@ fn list_format_json() -> Result<()> {
success: true
exit_code: 0
----- stdout -----
[{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable"}]
[{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE_DIR]/scripts/packages/poetry_editable"}]
----- stderr -----
"###
@ -630,7 +630,7 @@ fn list_format_freeze() -> Result<()> {
// Install the editable package.
uv_snapshot!(filters, install_command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir)
.env("CARGO_TARGET_DIR", "../../../target/target_install_editable"), @r###"
success: true
@ -644,7 +644,7 @@ fn list_format_freeze() -> Result<()> {
Installed 4 packages in [TIME]
+ anyio==4.0.0
+ idna==3.4
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ sniffio==1.3.0
"###
);
@ -652,18 +652,18 @@ fn list_format_freeze() -> Result<()> {
// Account for difference length workspace dir
let prefix = if cfg!(windows) { "file:///" } else { "file://" };
let workspace_len_difference = workspace_dir.as_str().len() + 32 - 16 - prefix.len();
let workspace_len_difference = workspace_dir.as_str().len() + 23 - 16 - prefix.len();
let find_divider = "-".repeat(25 + workspace_len_difference);
let replace_divider = "-".repeat(57);
let replace_divider = "-".repeat(48);
let find_header = format!(
"Editable project location{0}",
" ".repeat(workspace_len_difference)
);
let replace_header = format!("Editable project location{0}", " ".repeat(32));
let replace_header = format!("Editable project location{0}", " ".repeat(23));
let find_whitespace = " ".repeat(25 + workspace_len_difference);
let replace_whitespace = " ".repeat(57);
let replace_whitespace = " ".repeat(48);
let search_workspace = workspace_dir.as_str().strip_prefix(prefix).unwrap();
let replace_workspace = "[WORKSPACE_DIR]/";

View file

@ -470,7 +470,7 @@ fn show_editable() -> Result<()> {
// Install the editable package.
install_command(&context)
.arg("-e")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(current_dir()?)
.env(
"CARGO_TARGET_DIR",

View file

@ -2197,10 +2197,10 @@ fn sync_editable() -> Result<()> {
let requirements_txt = context.temp_dir.child("requirements.txt");
requirements_txt.write_str(&indoc::formatdoc! {r"
boltons==23.1.1
-e ../../scripts/editable-installs/maturin_editable
-e ../../scripts/packages/maturin_editable
numpy==1.26.2
# via poetry-editable
-e file://{current_dir}/../../scripts/editable-installs/poetry_editable
-e file://{current_dir}/../../scripts/packages/poetry_editable
",
current_dir = current_dir.simplified_display(),
})?;
@ -2230,9 +2230,9 @@ fn sync_editable() -> Result<()> {
Downloaded 2 packages in [TIME]
Installed 4 packages in [TIME]
+ boltons==23.1.1
+ maturin-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/maturin_editable)
+ maturin-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/maturin_editable)
+ numpy==1.26.2
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
"###
);
@ -2251,14 +2251,14 @@ fn sync_editable() -> Result<()> {
Built 1 editable in [TIME]
Uninstalled 1 package in [TIME]
Installed 1 package in [TIME]
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
+ poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
"###
);
// Make sure we have the right base case.
let python_source_file =
"../../scripts/editable-installs/maturin_editable/python/maturin_editable/__init__.py";
"../../scripts/packages/maturin_editable/python/maturin_editable/__init__.py";
let python_version_1 = indoc::indoc! {r"
from .maturin_editable import *
@ -2363,7 +2363,7 @@ fn sync_editable_and_registry() -> Result<()> {
// Use the `file:` syntax for extra coverage.
let requirements_txt = context.temp_dir.child("requirements.txt");
requirements_txt.write_str(indoc::indoc! {r"
-e file:../../scripts/editable-installs/black_editable
-e file:../../scripts/packages/black_editable
"
})?;
@ -2389,7 +2389,7 @@ fn sync_editable_and_registry() -> Result<()> {
Uninstalled 1 package in [TIME]
Installed 1 package in [TIME]
- black==24.1.0
+ black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable)
+ black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/black_editable)
"###
);
@ -2453,7 +2453,7 @@ fn sync_editable_and_registry() -> Result<()> {
Downloaded 1 package in [TIME]
Uninstalled 1 package in [TIME]
Installed 1 package in [TIME]
- black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable)
- black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/black_editable)
+ black==23.10.0
warning: The package `black` requires `click>=8.0.0`, but it's not installed.
warning: The package `black` requires `mypy-extensions>=0.4.3`, but it's not installed.

View file

@ -391,7 +391,7 @@ fn uninstall_editable_by_name() -> Result<()> {
let requirements_txt = context.temp_dir.child("requirements.txt");
requirements_txt.touch()?;
requirements_txt.write_str("-e ../../scripts/editable-installs/poetry_editable")?;
requirements_txt.write_str("-e ../../scripts/packages/poetry_editable")?;
sync_command(&context)
.arg(requirements_txt.path())
@ -414,7 +414,7 @@ fn uninstall_editable_by_name() -> Result<()> {
----- stderr -----
Uninstalled 1 package in [TIME]
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
"###
);
@ -445,7 +445,7 @@ fn uninstall_by_path() -> Result<()> {
let requirements_txt = context.temp_dir.child("requirements.txt");
requirements_txt.touch()?;
requirements_txt.write_str("../../scripts/editable-installs/poetry_editable")?;
requirements_txt.write_str("../../scripts/packages/poetry_editable")?;
sync_command(&context)
.arg(requirements_txt.path())
@ -461,7 +461,7 @@ fn uninstall_by_path() -> Result<()> {
// Uninstall the editable by path.
uv_snapshot!(filters, uninstall_command(&context)
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir), @r###"
success: true
exit_code: 0
@ -469,7 +469,7 @@ fn uninstall_by_path() -> Result<()> {
----- stderr -----
Uninstalled 1 package in [TIME]
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
"###
);
@ -500,7 +500,7 @@ fn uninstall_duplicate_by_path() -> Result<()> {
let requirements_txt = context.temp_dir.child("requirements.txt");
requirements_txt.touch()?;
requirements_txt.write_str("../../scripts/editable-installs/poetry_editable")?;
requirements_txt.write_str("../../scripts/packages/poetry_editable")?;
sync_command(&context)
.arg(requirements_txt.path())
@ -517,7 +517,7 @@ fn uninstall_duplicate_by_path() -> Result<()> {
// Uninstall the editable by both path and name.
uv_snapshot!(filters, uninstall_command(&context)
.arg("poetry-editable")
.arg("../../scripts/editable-installs/poetry_editable")
.arg("../../scripts/packages/poetry_editable")
.current_dir(&current_dir), @r###"
success: true
exit_code: 0
@ -525,7 +525,7 @@ fn uninstall_duplicate_by_path() -> Result<()> {
----- stderr -----
Uninstalled 1 package in [TIME]
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable)
- poetry-editable==0.1.0 (from file://[WORKSPACE_DIR]/scripts/packages/poetry_editable)
"###
);

View file

@ -1,3 +0,0 @@
-e scripts/editable-installs/poetry_editable
-e scripts/editable-installs/maturin_editable
boltons # normal depedency for comparison

View file

@ -1,14 +0,0 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile scripts/editable-installs/requirements.in
#
-e scripts/editable-installs/maturin_editable
# via -r scripts/editable-installs/requirements.in
-e scripts/editable-installs/poetry_editable
# via -r scripts/editable-installs/requirements.in
boltons==23.1.1
# via -r scripts/editable-installs/requirements.in
numpy==1.26.2
# via poetry-editable

4
scripts/packages/README Normal file
View file

@ -0,0 +1,4 @@
# packages
A collection of packages used to test editable installs and bespoke behaviors in packaging setups
and definitions.