diff --git a/crates/puffin/tests/pip_install.rs b/crates/puffin/tests/pip_install.rs index d74ec3cca..b20326b62 100644 --- a/crates/puffin/tests/pip_install.rs +++ b/crates/puffin/tests/pip_install.rs @@ -649,7 +649,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+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) + + black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) "###); }); @@ -701,7 +701,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+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) + - black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) + black==23.10.0 "###); }); diff --git a/crates/puffin/tests/pip_sync.rs b/crates/puffin/tests/pip_sync.rs index 2a44195ee..2cd8df205 100644 --- a/crates/puffin/tests/pip_sync.rs +++ b/crates/puffin/tests/pip_sync.rs @@ -2962,7 +2962,7 @@ fn sync_editable_and_registry() -> Result<()> { Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - black==24.1a1 - + black==0.1.0+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) + + black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) "###); }); @@ -3041,7 +3041,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+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) + - black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/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. diff --git a/scripts/editable-installs/black_editable/src/black_editable/__init__.py b/scripts/editable-installs/black_editable/black/__init__.py similarity index 100% rename from scripts/editable-installs/black_editable/src/black_editable/__init__.py rename to scripts/editable-installs/black_editable/black/__init__.py diff --git a/scripts/editable-installs/black_editable/pyproject.toml b/scripts/editable-installs/black_editable/pyproject.toml index 9a0f6a2c8..a3e3c8aa3 100644 --- a/scripts/editable-installs/black_editable/pyproject.toml +++ b/scripts/editable-installs/black_editable/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "black" version = "0.1.0" -description = "Default template for PDM package" +description = "Default template for a Flit project" authors = [ {name = "konstin", email = "konstin@mailbox.org"}, ] @@ -10,8 +10,5 @@ requires-python = ">=3.11,<3.13" license = {text = "MIT"} [build-system] -requires = ["pdm-backend"] -build-backend = "pdm.backend" - -[tool.pdm] -package-type = "library" +requires = ["flit_core>=3.4,<4"] +build-backend = "flit_core.buildapi"