From dd8d2c138c16f79c52d50238b49a5c3692a8efed Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Mon, 21 Feb 2022 19:46:15 +0100 Subject: [PATCH] pyln: Migrate pyln-client to PEP 517 (poetry) --- contrib/pyln-client/.gitignore | 2 +- contrib/pyln-client/pyln/client/__init__.py | 2 +- contrib/pyln-client/pyproject.toml | 22 ++++++++++++++ contrib/pyln-client/requirements.txt | 3 -- contrib/pyln-client/setup.py | 32 --------------------- 5 files changed, 24 insertions(+), 37 deletions(-) create mode 100644 contrib/pyln-client/pyproject.toml delete mode 100644 contrib/pyln-client/requirements.txt delete mode 100644 contrib/pyln-client/setup.py diff --git a/contrib/pyln-client/.gitignore b/contrib/pyln-client/.gitignore index 3122c62bf..c04bc49f7 100644 --- a/contrib/pyln-client/.gitignore +++ b/contrib/pyln-client/.gitignore @@ -1 +1 @@ -pyln/client/__version__.py \ No newline at end of file +poetry.lock diff --git a/contrib/pyln-client/pyln/client/__init__.py b/contrib/pyln-client/pyln/client/__init__.py index da1d9ae8b..c50292f89 100644 --- a/contrib/pyln-client/pyln/client/__init__.py +++ b/contrib/pyln-client/pyln/client/__init__.py @@ -1,8 +1,8 @@ from .lightning import LightningRpc, RpcError, Millisatoshi from .plugin import Plugin, monkey_patch, RpcException from .gossmap import Gossmap, GossmapNode, GossmapChannel, GossmapNodeId -from .__version__ import __version__ +__version__ = "0.10.2" __all__ = [ "LightningRpc", diff --git a/contrib/pyln-client/pyproject.toml b/contrib/pyln-client/pyproject.toml new file mode 100644 index 000000000..b4c883b9a --- /dev/null +++ b/contrib/pyln-client/pyproject.toml @@ -0,0 +1,22 @@ +[tool.poetry] +name = "pyln-client" +version = "0.10.2" +description = "Client library and plugin library for c-lightning" +authors = ["Christian Decker "] +license = "BSD-MIT" + +packages = [ + { include = "pyln/client" }, +] + +[tool.poetry.dependencies] +python = "^3.7" +pyln-proto = { path = "../pyln-proto" } +pyln-bolt7 = { path = "../pyln-spec/bolt7" } + +[tool.poetry.dev-dependencies] +pytest = "^7.0.1" + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/contrib/pyln-client/requirements.txt b/contrib/pyln-client/requirements.txt deleted file mode 100644 index e7776fb68..000000000 --- a/contrib/pyln-client/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -recommonmark~=0.7 -pyln-bolt7 -pyln-proto diff --git a/contrib/pyln-client/setup.py b/contrib/pyln-client/setup.py deleted file mode 100644 index 77858c687..000000000 --- a/contrib/pyln-client/setup.py +++ /dev/null @@ -1,32 +0,0 @@ -from setuptools import setup -import io - - -with io.open('README.md', encoding='utf-8') as f: - long_description = f.read() - -with io.open('requirements.txt', encoding='utf-8') as f: - requirements = [r for r in f.read().split('\n') if len(r)] - - -setup(name='pyln-client', - description='Client library for lightningd', - long_description=long_description, - long_description_content_type='text/markdown', - url='http://github.com/ElementsProject/lightning', - author='Christian Decker', - author_email='decker.christian@gmail.com', - license='MIT', - packages=['pyln.client'], - scripts=[], - zip_safe=True, - use_scm_version={ - "root": "../..", - "relative_to": __file__, - "write_to": "contrib/pyln-client/pyln/client/__version__.py", - "write_to_template": "__version__ = \"{version}\"\n", - "version_scheme": "post-release", - "local_scheme": "no-local-version", - }, - setup_requires=["setuptools_scm"], - install_requires=requirements)