From 1facf626d57010ef8517012f74ab12e54cf3caec Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 4 Mar 2019 13:38:48 +1030 Subject: [PATCH] pylightning: allow version querying from within modules. With the preceeding UTF-8 fix, I'd like to detect UTF-8 support. But AFAICT Python doesn't have a standard way of doing version exposure. So I added __version__, but now we need to make sure it matches. I used the hackiest possible method. [ Christian Decker fixed version to be sane, so previous comment no longer applies! --RR ] Signed-off-by: Rusty Russell --- contrib/pylightning/lightning/__init__.py | 2 +- contrib/pylightning/lightning/lightning.py | 2 ++ contrib/pylightning/setup.py | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/pylightning/lightning/__init__.py b/contrib/pylightning/lightning/__init__.py index a5170aed4..e70aa2007 100644 --- a/contrib/pylightning/lightning/__init__.py +++ b/contrib/pylightning/lightning/__init__.py @@ -1,2 +1,2 @@ -from .lightning import LightningRpc, RpcError, Millisatoshi +from .lightning import LightningRpc, RpcError, Millisatoshi, __version__ from .plugin import Plugin, monkey_patch diff --git a/contrib/pylightning/lightning/lightning.py b/contrib/pylightning/lightning/lightning.py index e2e46f121..e3b930ae1 100644 --- a/contrib/pylightning/lightning/lightning.py +++ b/contrib/pylightning/lightning/lightning.py @@ -3,6 +3,8 @@ import json import logging import socket +__version__ = "0.0.7.1" + class RpcError(ValueError): def __init__(self, method, payload, error): diff --git a/contrib/pylightning/setup.py b/contrib/pylightning/setup.py index 4565d1f51..2e1c94a12 100644 --- a/contrib/pylightning/setup.py +++ b/contrib/pylightning/setup.py @@ -1,10 +1,12 @@ from setuptools import setup +import lightning + with open('README.md', encoding='utf-8') as f: long_description = f.read() setup(name='pylightning', - version='0.0.7', + version=lightning.__version__, description='Client library for lightningd', long_description=long_description, long_description_content_type='text/markdown',