pyln minor fixes, move bolts to pyln.spec.bolt* #3777
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustyrussell
force-pushed
the
pyln-setup-fixes
branch
3 times, most recently
from
8a7fe10
to
7bf03dc
Compare
cdecker
reviewed
Jun 23, 2020
|
I really do think we want individual packages for the bolts. They will change fast, but this way they only change if something actually changes, not because of an unrelated repository change. Perhaps an even better option is to number like so: 1.0.., and bump csvversion only when the csv changes. That allows you to specify ==1.0.42.* if you don't care about any textual changes? |
Remove non-existant pyln.proto.bolts. bolts will have separate setup.py, so we can rev the versions individually. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
|
OK, since it can't fetch pyln.proto 0.8.3 from the real repo yet, I uploaded it to the test repo, and applied the following workaround for testing (downloads previous version to get all the deps, then gets the latest from testing repo): diff --git a/contrib/pyln-spec/Makefile b/contrib/pyln-spec/Makefile
index 95b00fc22..081c6443d 100755
--- a/contrib/pyln-spec/Makefile
+++ b/contrib/pyln-spec/Makefile
@@ -58,7 +58,8 @@ test-release-bolt%: $(ARTEFACTS)
# pyln-proto already installed).
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 pyln.proto pytest flaky pytest-timeout
+ testpypi-$*/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln.proto
testpypi-$*/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln-bolt$*
testpypi-$*/bin/python3 -c "from pyln.spec import bolt$* as bolt;assert(bolt.__version__ == '$(call version,$*)')"
testpypi-$*/bin/pytest bolt$*/tests |
rustyrussell
force-pushed
the
pyln-setup-fixes
branch
from
7bf03dc
to
40353dd
Compare
… indep.
They're almost entirely autogenerated, and we use symlinks into the
top directory to reduce replication.
They can't be under pyln.spec.message, because a package can't also
be a namespace.
We also add fulltext and desc fields, and exclude our "gen" files from
flake8, since the spec quotes contain weird whitespace.
Changelog-Added: Python: pyln.spec.bolt{1,2,4,7} packages.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This includes some real bugfixes, since it noticed some places we were being loose with different types! Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
See lightning/bolts@9e8e29a Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
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 <rusty@rustcorp.com.au>
Changelog-Changed: pyln.proto version now 0.8.3 to indicate pyln.proto.message Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
…nts.txt We depend on packages, not modules within them. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
…version. Now they look like 1.0.1.137, so you can explicitly depend on a csv change (without caring about a textual change). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
rustyrussell
force-pushed
the
pyln-setup-fixes
branch
from
40353dd
to
39a2a9d
Compare
|
Trivial rebase to fix a typo and an accidental libwally revert! |
|
ACK 39a2a9d |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3767