From e6256f296f62f5149b7b98214a5ad93d90bc71aa Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Fri, 20 Dec 2024 22:52:03 +1000 Subject: [PATCH] Revert "packaging: Try uv path dependencies in projects" This reverts commit b1eb3d30f50a880e24b2fe061ac26357a8010e7d. - Other projects couldn't depend on subprojects anymore. --- eris/pyproject.toml | 11 +++-------- eris/uv.lock | 21 ++++++--------------- fill3/pyproject.toml | 5 +---- fill3/uv.lock | 7 ++----- lscolors/pyproject.toml | 5 +---- lscolors/uv.lock | 7 ++----- termstr/pyproject.toml | 2 -- 7 files changed, 15 insertions(+), 43 deletions(-) diff --git a/eris/pyproject.toml b/eris/pyproject.toml index 4a3109b..38e45d1 100644 --- a/eris/pyproject.toml +++ b/eris/pyproject.toml @@ -1,10 +1,5 @@ tool.uv.package = true -[tool.uv.sources] -lscolors = { path = "../lscolors", editable = true } -termstr = { path = "../termstr", editable = true } -fill3 = { path = "../fill3", editable = true } - [project] name = "eris" version = "v2024.12.20" @@ -17,13 +12,13 @@ requires-python = ">=3.11" dependencies = [ "decorator==5.1.1", "docopt==0.6.2", - "fill3", - "lscolors", + "fill3 @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=fill3", + "lscolors @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=lscolors", "pexpect==4.8.0", "pillow==10.0.0", "pygments==2.16.1", "pyinotify==0.9.6", - "termstr", + "termstr @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=termstr", "toml==0.10.2", ] diff --git a/eris/uv.lock b/eris/uv.lock index 2effee4..63e018b 100644 --- a/eris/uv.lock +++ b/eris/uv.lock @@ -43,38 +43,32 @@ dependencies = [ requires-dist = [ { name = "decorator", specifier = "==5.1.1" }, { name = "docopt", specifier = "==0.6.2" }, - { name = "fill3", editable = "../fill3" }, - { name = "lscolors", editable = "../lscolors" }, + { name = "fill3", git = "https://gitlab.com/ahamilton/eris?subdirectory=fill3&rev=v2024.12.18" }, + { name = "lscolors", git = "https://gitlab.com/ahamilton/eris?subdirectory=lscolors&rev=v2024.12.18" }, { name = "pexpect", specifier = "==4.8.0" }, { name = "pillow", specifier = "==10.0.0" }, { name = "pygments", specifier = "==2.16.1" }, { name = "pyinotify", specifier = "==0.9.6" }, - { name = "termstr", editable = "../termstr" }, + { name = "termstr", git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18" }, { name = "toml", specifier = "==0.10.2" }, ] [[package]] name = "fill3" version = "2024.12.18" -source = { editable = "../fill3" } +source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=fill3&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } dependencies = [ { name = "termstr" }, ] -[package.metadata] -requires-dist = [{ name = "termstr", virtual = "../termstr" }] - [[package]] name = "lscolors" version = "2024.12.18" -source = { editable = "../lscolors" } +source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=lscolors&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } dependencies = [ { name = "termstr" }, ] -[package.metadata] -requires-dist = [{ name = "termstr", virtual = "../termstr" }] - [[package]] name = "pexpect" version = "4.8.0" @@ -142,14 +136,11 @@ sdist = { url = "https://files.pythonhosted.org/packages/e3/c0/fd5b18dde17c12496 [[package]] name = "termstr" version = "2024.12.18" -source = { editable = "../termstr" } +source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } dependencies = [ { name = "cwcwidth" }, ] -[package.metadata] -requires-dist = [{ name = "cwcwidth", specifier = "==0.1.5" }] - [[package]] name = "toml" version = "0.10.2" diff --git a/fill3/pyproject.toml b/fill3/pyproject.toml index c1468f8..8154e6f 100644 --- a/fill3/pyproject.toml +++ b/fill3/pyproject.toml @@ -1,8 +1,5 @@ tool.uv.package = true -[tool.uv.sources] -termstr = { path = "../termstr" } - [project] name = "fill3" version = "v2024.12.20" @@ -12,7 +9,7 @@ authors = [ ] requires-python = ">=3.11" dependencies = [ - "termstr", + "termstr @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=termstr", ] [project.urls] diff --git a/fill3/uv.lock b/fill3/uv.lock index f09c5f5..6e50813 100644 --- a/fill3/uv.lock +++ b/fill3/uv.lock @@ -16,15 +16,12 @@ dependencies = [ ] [package.metadata] -requires-dist = [{ name = "termstr", virtual = "../termstr" }] +requires-dist = [{ name = "termstr", git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18" }] [[package]] name = "termstr" version = "2024.12.18" -source = { virtual = "../termstr" } +source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } dependencies = [ { name = "cwcwidth" }, ] - -[package.metadata] -requires-dist = [{ name = "cwcwidth", specifier = "==0.1.5" }] diff --git a/lscolors/pyproject.toml b/lscolors/pyproject.toml index e5676d8..3498018 100644 --- a/lscolors/pyproject.toml +++ b/lscolors/pyproject.toml @@ -5,9 +5,6 @@ build-backend = "hatchling.build" [tool.hatch.metadata] allow-direct-references = true -[tool.uv.sources] -termstr = { path = "../termstr" } - [project] name = "lscolors" version = "v2024.12.20" @@ -17,7 +14,7 @@ authors = [ ] requires-python = ">=3.11" dependencies = [ - "termstr", + "termstr @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=termstr", ] [project.urls] diff --git a/lscolors/uv.lock b/lscolors/uv.lock index ba7557a..aa9ed5a 100644 --- a/lscolors/uv.lock +++ b/lscolors/uv.lock @@ -16,15 +16,12 @@ dependencies = [ ] [package.metadata] -requires-dist = [{ name = "termstr", virtual = "../termstr" }] +requires-dist = [{ name = "termstr", git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18" }] [[package]] name = "termstr" version = "2024.12.18" -source = { virtual = "../termstr" } +source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } dependencies = [ { name = "cwcwidth" }, ] - -[package.metadata] -requires-dist = [{ name = "cwcwidth", specifier = "==0.1.5" }] diff --git a/termstr/pyproject.toml b/termstr/pyproject.toml index d268d31..6b79af4 100644 --- a/termstr/pyproject.toml +++ b/termstr/pyproject.toml @@ -13,5 +13,3 @@ dependencies = [ [project.urls] Homepage = "https://github.com/ahamilton/eris" -[tool.setuptools] -py-modules=["termstr"]