From 014ede05856793da483c25c6e6f3b0c66751e9bb Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 22 Jun 2020 20:45:20 +0930 Subject: [PATCH] pyln.proto: fix test-release target 1. version was 0.0.2 in setup.py, which means we didn't get the dist/ files we expected. 2. We need 'bdist_wheel' to make the .whl file. 3. --no-site-packaged was apparently removed in 0.20.0, and was default long before that. Signed-off-by: Rusty Russell --- contrib/pyln-proto/Makefile | 4 ++-- contrib/pyln-proto/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/pyln-proto/Makefile b/contrib/pyln-proto/Makefile index 81edb3985..65cdf74e6 100644 --- a/contrib/pyln-proto/Makefile +++ b/contrib/pyln-proto/Makefile @@ -23,7 +23,7 @@ $(SDIST_FILE): python3 setup.py sdist $(BDIST_FILE): - python3 setup.py bdist + python3 setup.py bdist_wheel test-release: check $(ARTEFACTS) python3 -m twine upload --repository testpypi --skip-existing $(ARTEFACTS) @@ -31,7 +31,7 @@ test-release: check $(ARTEFACTS) # Create a test virtualenv, install from the testpypi and run the # tests against it (make sure not to use any virtualenv that may have # pyln-proto already installed). - virtualenv --no-site-packages testpypi --python=/usr/bin/python3 --download --always-copy --clear + virtualenv testpypi --python=/usr/bin/python3 --download --always-copy --clear # Install the requirements from the prod repo, they are not being kept up to date on the test repo testpypi/bin/python3 -m pip install -r requirements.txt pytest flaky pytest-timeout testpypi/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln-proto diff --git a/contrib/pyln-proto/setup.py b/contrib/pyln-proto/setup.py index a18f63224..1e1ea5364 100644 --- a/contrib/pyln-proto/setup.py +++ b/contrib/pyln-proto/setup.py @@ -9,7 +9,7 @@ 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-proto', - version='0.0.2', + version='0.8.2', description='Pure python implementation of the Lightning Network protocol', long_description=long_description, long_description_content_type='text/markdown',