Skip to content

Commit

Permalink
Remove NumPy from editable test (astral-sh#2473)
Browse files Browse the repository at this point in the history
  • Loading branch information
charliermarsh authored Mar 15, 2024
1 parent bd3c577 commit fdee1e2
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 38 deletions.
12 changes: 8 additions & 4 deletions crates/uv/tests/pip_compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2553,6 +2553,8 @@ fn compile_editable() -> Result<()> {
# via black
aiosignal==1.3.1
# via aiohttp
anyio==4.0.0
# via poetry-editable
attrs==23.1.0
# via aiohttp
boltons==23.1.1
Expand All @@ -2561,21 +2563,23 @@ fn compile_editable() -> Result<()> {
# aiohttp
# aiosignal
idna==3.4
# via yarl
# via
# anyio
# yarl
multidict==6.0.4
# via
# aiohttp
# yarl
numpy==1.26.2
# via poetry-editable
sniffio==1.3.0
# via anyio
uvloop==0.19.0
# via black
yarl==1.9.2
# via aiohttp
----- stderr -----
Built 3 editables in [TIME]
Resolved 13 packages in [TIME]
Resolved 14 packages in [TIME]
"###);

Ok(())
Expand Down
12 changes: 7 additions & 5 deletions crates/uv/tests/pip_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -527,11 +527,13 @@ fn install_editable() -> Result<()> {
----- stderr -----
Built 1 editable in [TIME]
Resolved 2 packages in [TIME]
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ numpy==1.26.2
Resolved 4 packages in [TIME]
Downloaded 3 packages in [TIME]
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)
+ sniffio==1.3.0
"###
);

Expand Down Expand Up @@ -577,7 +579,7 @@ fn install_editable() -> Result<()> {
----- stderr -----
Built 1 editable in [TIME]
Resolved 8 packages in [TIME]
Resolved 10 packages in [TIME]
Downloaded 6 packages in [TIME]
Installed 7 packages in [TIME]
+ black==23.11.0
Expand Down
82 changes: 55 additions & 27 deletions crates/uv/tests/pip_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ fn list_editable() -> Result<()> {
----- stderr -----
Built 1 editable in [TIME]
Resolved 2 packages in [TIME]
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ numpy==1.26.2
Resolved 4 packages in [TIME]
Downloaded 3 packages in [TIME]
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)
+ sniffio==1.3.0
"###
);

Expand Down Expand Up @@ -183,8 +185,10 @@ fn list_editable() -> Result<()> {
----- stdout -----
Package Version Editable project location
--------------- ------- ---------------------------------------------------------
numpy 1.26.2
anyio 4.0.0
idna 3.4
poetry-editable 0.1.0 [WORKSPACE_DIR]/scripts/editable-installs/poetry_editable
sniffio 1.3.0
----- stderr -----
"###
Expand Down Expand Up @@ -219,11 +223,13 @@ fn list_editable_only() -> Result<()> {
----- stderr -----
Built 1 editable in [TIME]
Resolved 2 packages in [TIME]
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ numpy==1.26.2
Resolved 4 packages in [TIME]
Downloaded 3 packages in [TIME]
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)
+ sniffio==1.3.0
"###
);

Expand Down Expand Up @@ -289,7 +295,9 @@ fn list_editable_only() -> Result<()> {
----- stdout -----
Package Version
------- -------
numpy 1.26.2
anyio 4.0.0
idna 3.4
sniffio 1.3.0
----- stderr -----
"###
Expand Down Expand Up @@ -341,11 +349,13 @@ fn list_exclude() -> Result<()> {
----- stderr -----
Built 1 editable in [TIME]
Resolved 2 packages in [TIME]
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ numpy==1.26.2
Resolved 4 packages in [TIME]
Downloaded 3 packages in [TIME]
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)
+ sniffio==1.3.0
"###
);

Expand Down Expand Up @@ -393,7 +403,10 @@ fn list_exclude() -> Result<()> {
----- 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
sniffio 1.3.0
----- stderr -----
"###
Expand All @@ -413,7 +426,9 @@ fn list_exclude() -> Result<()> {
----- stdout -----
Package Version
------- -------
numpy 1.26.2
anyio 4.0.0
idna 3.4
sniffio 1.3.0
----- stderr -----
"###
Expand All @@ -433,6 +448,11 @@ fn list_exclude() -> Result<()> {
success: true
exit_code: 0
----- stdout -----
Package Version
------- -------
anyio 4.0.0
idna 3.4
sniffio 1.3.0
----- stderr -----
"###
Expand Down Expand Up @@ -470,11 +490,13 @@ fn list_format_json() -> Result<()> {
----- stderr -----
Built 1 editable in [TIME]
Resolved 2 packages in [TIME]
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ numpy==1.26.2
Resolved 4 packages in [TIME]
Downloaded 3 packages in [TIME]
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)
+ sniffio==1.3.0
"###
);

Expand Down Expand Up @@ -526,7 +548,7 @@ fn list_format_json() -> Result<()> {
success: true
exit_code: 0
----- stdout -----
[{"name":"numpy","version":"1.26.2"},{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE_DIR]/scripts/editable-installs/poetry_editable"}]
[{"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"}]
----- stderr -----
"###
Expand Down Expand Up @@ -562,7 +584,7 @@ fn list_format_json() -> Result<()> {
success: true
exit_code: 0
----- stdout -----
[{"name":"numpy","version":"1.26.2"}]
[{"name":"anyio","version":"4.0.0"},{"name":"idna","version":"3.4"},{"name":"sniffio","version":"1.3.0"}]
----- stderr -----
"###
Expand Down Expand Up @@ -617,11 +639,13 @@ fn list_format_freeze() -> Result<()> {
----- stderr -----
Built 1 editable in [TIME]
Resolved 2 packages in [TIME]
Downloaded 1 package in [TIME]
Installed 2 packages in [TIME]
+ numpy==1.26.2
Resolved 4 packages in [TIME]
Downloaded 3 packages in [TIME]
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)
+ sniffio==1.3.0
"###
);

Expand Down Expand Up @@ -666,8 +690,10 @@ fn list_format_freeze() -> Result<()> {
success: true
exit_code: 0
----- stdout -----
numpy==1.26.2
anyio==4.0.0
idna==3.4
poetry-editable==0.1.0
sniffio==1.3.0
----- stderr -----
"###
Expand Down Expand Up @@ -703,7 +729,9 @@ fn list_format_freeze() -> Result<()> {
success: true
exit_code: 0
----- stdout -----
numpy==1.26.2
anyio==4.0.0
idna==3.4
sniffio==1.3.0
----- stderr -----
"###
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/pip_show.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ fn show_editable() -> Result<()> {
Name: poetry-editable
Version: 0.1.0
Location: [WORKSPACE_DIR]/site-packages
Requires: numpy
Requires: anyio
----- stderr -----
"###
Expand Down
2 changes: 1 addition & 1 deletion scripts/editable-installs/poetry_editable/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Astral Software Inc. <[email protected]>"]

[tool.poetry.dependencies]
python = "^3.10"
numpy = "^1"
anyio = "^4"

[build-system]
requires = ["poetry-core"]
Expand Down

0 comments on commit fdee1e2

Please sign in to comment.