From 4596ede8cec27b6c604035e986ed92c93d7c8eb7 Mon Sep 17 00:00:00 2001 From: Misode Date: Sat, 4 Jan 2025 21:08:34 +0100 Subject: [PATCH 1/2] Try the beet overlay fix PR --- pyproject.toml | 2 +- uv.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4567e2f7b3..91041fdace 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ authors = [ ] requires-python = ">= 3.10, < 4.0" dependencies = [ - "beet @ git+https://github.com/misode/beet.git@fix-overlay-folders", + "beet @ git+https://github.com/misode/beet.git@fix-overlay-scopes", "mecha >= 0.95.2", "bolt >= 0.49.1", "PyYAML >= 6.0, < 7.0", diff --git a/uv.lock b/uv.lock index 4c7107e5e6..746da818e8 100644 --- a/uv.lock +++ b/uv.lock @@ -13,7 +13,7 @@ wheels = [ [[package]] name = "beet" version = "0.108.5" -source = { git = "https://github.com/misode/beet.git?rev=fix-overlay-folders#f3cf797e1791d532cb23456821fd215b080e9fb3" } +source = { git = "https://github.com/misode/beet.git?rev=fix-overlay-scopes#4df3287a9c65aaa7387b1bc7c8193add7f60156c" } dependencies = [ { name = "click" }, { name = "click-help-colors" }, @@ -195,7 +195,7 @@ dev = [ [package.metadata] requires-dist = [ - { name = "beet", git = "https://github.com/misode/beet.git?rev=fix-overlay-folders" }, + { name = "beet", git = "https://github.com/misode/beet.git?rev=fix-overlay-scopes" }, { name = "bolt", specifier = ">=0.49.1" }, { name = "mecha", specifier = ">=0.95.2" }, { name = "pillow", specifier = ">=10.0.0,<11.0.0" }, From 0f6396e32cd67dd9245fa6ecbbd237612161e240 Mon Sep 17 00:00:00 2001 From: Misode Date: Sat, 11 Jan 2025 11:59:17 +0100 Subject: [PATCH 2/2] Beet PR was merged --- pyproject.toml | 2 +- uv.lock | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 91041fdace..4161ddac7e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ authors = [ ] requires-python = ">= 3.10, < 4.0" dependencies = [ - "beet @ git+https://github.com/misode/beet.git@fix-overlay-scopes", + "beet >= 0.109.3", "mecha >= 0.95.2", "bolt >= 0.49.1", "PyYAML >= 6.0, < 7.0", diff --git a/uv.lock b/uv.lock index 746da818e8..6f014a47d0 100644 --- a/uv.lock +++ b/uv.lock @@ -12,8 +12,8 @@ wheels = [ [[package]] name = "beet" -version = "0.108.5" -source = { git = "https://github.com/misode/beet.git?rev=fix-overlay-scopes#4df3287a9c65aaa7387b1bc7c8193add7f60156c" } +version = "0.109.3" +source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "click" }, { name = "click-help-colors" }, @@ -26,6 +26,10 @@ dependencies = [ { name = "toml" }, { name = "typing-extensions" }, ] +sdist = { url = "https://files.pythonhosted.org/packages/2b/9d/8fe261d5a12a24221878b5829ac474b30da91b7fa2840dc5c1cf8d151a98/beet-0.109.3.tar.gz", hash = "sha256:8a50a61d35bf90a0ef1dfa18b5d31197cbea63844f2cdf3ccecfea3d5a1af1e7", size = 91440 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/72/bf/f8cae8735e0bc1df800ed5825c9de4c1b7f03fc3d1a6d17c225a9677ba32/beet-0.109.3-py3-none-any.whl", hash = "sha256:fa353592ba610e4822f7d13c0981b02422e734f10fc2522f23e15798a872c3fd", size = 116318 }, +] [[package]] name = "black" @@ -195,7 +199,7 @@ dev = [ [package.metadata] requires-dist = [ - { name = "beet", git = "https://github.com/misode/beet.git?rev=fix-overlay-scopes" }, + { name = "beet", specifier = ">=0.109.3" }, { name = "bolt", specifier = ">=0.49.1" }, { name = "mecha", specifier = ">=0.95.2" }, { name = "pillow", specifier = ">=10.0.0,<11.0.0" },