Skip to content

Commit

Permalink
Move Black editable to flit backend (astral-sh#1114)
Browse files Browse the repository at this point in the history
I ran into a bug in PDM that's making it impossible to use the Black
example for extras: https://github.com/pdm-project/pdm/issues/2591.

I've confirmed that Flit handles it correctly.
  • Loading branch information
charliermarsh authored Jan 26, 2024
1 parent 3a05ef5 commit 57c116e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions crates/puffin/tests/pip_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
"###);
});

Expand Down Expand Up @@ -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
"###);
});
Expand Down
4 changes: 2 additions & 2 deletions crates/puffin/tests/pip_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
"###);
});

Expand Down Expand Up @@ -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.
Expand Down
9 changes: 3 additions & 6 deletions scripts/editable-installs/black_editable/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"},
]
Expand All @@ -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"

0 comments on commit 57c116e

Please sign in to comment.