From 722f2911df37dcf95fc1b7b761cec46156194e47 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Tue, 15 Mar 2022 10:58:38 +0100 Subject: [PATCH] py: Disentangle pyln dependencies Turns out that the pyln-proto dependency in the bolt packages is only needed for testing, not for production. Making it a dev-dependency means it isn't considered in resolution anymore. Since the bolt, testing and client packages are to be used outside from the project we can't use relative dependencies either, so make then dependent on the version on PyPI. This also means we had to push a couple of updated to PyPI. Changelog-None --- contrib/pyln-client/pyproject.toml | 6 +++--- contrib/pyln-proto/pyproject.toml | 2 +- contrib/pyln-spec/bolt1/pyproject.toml | 6 +++--- contrib/pyln-spec/bolt2/pyproject.toml | 6 +++--- contrib/pyln-spec/bolt4/pyproject.toml | 6 +++--- contrib/pyln-spec/bolt7/pyproject.toml | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/pyln-client/pyproject.toml b/contrib/pyln-client/pyproject.toml index b4c883b9a..3014e19d7 100644 --- a/contrib/pyln-client/pyproject.toml +++ b/contrib/pyln-client/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyln-client" -version = "0.10.2" +version = "0.10.2.post1" description = "Client library and plugin library for c-lightning" authors = ["Christian Decker "] license = "BSD-MIT" @@ -11,8 +11,8 @@ packages = [ [tool.poetry.dependencies] python = "^3.7" -pyln-proto = { path = "../pyln-proto" } -pyln-bolt7 = { path = "../pyln-spec/bolt7" } +pyln-bolt7 = "^1.0.186" +pyln-proto = "^0.10.2" [tool.poetry.dev-dependencies] pytest = "^7.0.1" diff --git a/contrib/pyln-proto/pyproject.toml b/contrib/pyln-proto/pyproject.toml index 6bb2af431..cdc074d85 100644 --- a/contrib/pyln-proto/pyproject.toml +++ b/contrib/pyln-proto/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyln-proto" -version = "0.10.2" +version = "0.10.2.post1" description = "This package implements some of the Lightning Network protocol in pure python. It is intended for protocol testing and some minor tooling only. It is not deemed secure enough to handle any amount of real funds (you have been warned!)." authors = ["Christian Decker "] license = "BSD-MIT" diff --git a/contrib/pyln-spec/bolt1/pyproject.toml b/contrib/pyln-spec/bolt1/pyproject.toml index 903c33114..c6ee8219e 100644 --- a/contrib/pyln-spec/bolt1/pyproject.toml +++ b/contrib/pyln-spec/bolt1/pyproject.toml @@ -1,8 +1,8 @@ [tool.poetry] name = "pyln-bolt1" -version = "1.0.1.187" +version = "1.0.1.187.post0" description = "" -authors = ["Rusty Russell <@rustyrussell>"] +authors = ["Rusty Russell "] license = "MIT" packages = [ @@ -11,9 +11,9 @@ packages = [ [tool.poetry.dependencies] python = "^3.7" -pyln-proto = {path = "../../pyln-proto"} [tool.poetry.dev-dependencies] +pyln-proto = "^0.10.2" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/contrib/pyln-spec/bolt2/pyproject.toml b/contrib/pyln-spec/bolt2/pyproject.toml index 14895c170..10367daa9 100644 --- a/contrib/pyln-spec/bolt2/pyproject.toml +++ b/contrib/pyln-spec/bolt2/pyproject.toml @@ -1,8 +1,8 @@ [tool.poetry] name = "pyln-bolt2" -version = "1.0.1.187" +version = "1.0.2.187.post0" description = "A pure python implementation of BOLT2" -authors = ["Rusty Russell <@rustyrussell>"] +authors = ["Rusty Russell "] license = "MIT" packages = [ @@ -11,9 +11,9 @@ packages = [ [tool.poetry.dependencies] python = "^3.7" -pyln-proto = {path = "../../pyln-proto"} [tool.poetry.dev-dependencies] +pyln-proto = "^0.10.2" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/contrib/pyln-spec/bolt4/pyproject.toml b/contrib/pyln-spec/bolt4/pyproject.toml index 33afd320c..1d3361de1 100644 --- a/contrib/pyln-spec/bolt4/pyproject.toml +++ b/contrib/pyln-spec/bolt4/pyproject.toml @@ -1,8 +1,8 @@ [tool.poetry] name = "pyln-bolt4" -version = "1.0.1.187" +version = "1.0.2.187.post0" description = "A pure python implementation of BOLT4" -authors = ["Rusty Russell <@rustyrussell>"] +authors = ["Rusty Russell "] license = "MIT" packages = [ @@ -11,9 +11,9 @@ packages = [ [tool.poetry.dependencies] python = "^3.7" -pyln-proto = {path = "../../pyln-proto"} [tool.poetry.dev-dependencies] +pyln-proto = "^0.10.2" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/contrib/pyln-spec/bolt7/pyproject.toml b/contrib/pyln-spec/bolt7/pyproject.toml index 1062ae710..bc6b128ea 100644 --- a/contrib/pyln-spec/bolt7/pyproject.toml +++ b/contrib/pyln-spec/bolt7/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyln-bolt7" -version = "1.0.186" +version = "1.0.2.186.post0" description = "BOLT7" authors = ["Rusty Russell"] license = "BSD-MIT" @@ -11,9 +11,9 @@ packages = [ [tool.poetry.dependencies] python = "^3.7" -pyln-proto = { path = "../../pyln-proto" } [tool.poetry.dev-dependencies] +pyln-proto = "^0.10.2" [build-system] requires = ["poetry-core>=1.0.0"]