aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-18 22:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

pyln: use poetry version, add target to check version, use poetry publish.

Browse Source 
Remove non-working test-release target.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-08-24 19:58:36 +09:30
committed by Christian Decker
parent 910116c9e6
commit 3c80b22d6f
3 changed files with 55 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
contrib/pyln-client/Makefile
View File

@@ -1,8 +1,7 @@
#!/usr/bin/make #!/usr/bin/make
.PHONY: bdist sdist release check check-source check-flake8 check-mypy
PKG=client PKG=client
VERSION = $(shell python3 -c 'from pyln import ${PKG};print(${PKG}.__version__)') VERSION := $(shell poetry version -s)
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS =
@@ -16,7 +15,14 @@ ARTEFACTS = $(BDIST_FILE) $(SDIST_FILE)
check: check-source check-pytest check: check-source check-pytest
check-source: check-flake8 check-mypy check-source: check-flake8 check-mypy check-version
# We want to create an env for this directory.
check-version:
poetry env remove -q python3 || true
poetry env use python3
poetry install
[ "`poetry run python3 -c 'from pyln import $(PKG); print($(PKG).__version__)'`" = "$(VERSION)" ] || exit 1
check-flake8: check-flake8:
flake8 --ignore=E501,E731,W503,E741 pyln tests flake8 --ignore=E501,E731,W503,E741 pyln tests
@@ -27,33 +33,15 @@ check-pytest:
check-mypy: check-mypy:
# MYPYPATH=$(PYTHONPATH) mypy --namespace-packages --follow-imports=skip tests pyln # MYPYPATH=$(PYTHONPATH) mypy --namespace-packages --follow-imports=skip tests pyln
pyproject.toml: pyln/${PKG}/__init__.py # Having versions in two places sucks, but so does every other option :(
poetry version ${VERSION} # See https://github.com/python-poetry/poetry/issues/144
upgrade-version:
if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
poetry version $(NEW_VERSION)
sed 's/^__version__ = .*/__version__ = "$(NEW_VERSION)"/' < pyln/$(PKG)/__init__.py > pyln/$(PKG)/__init__.py.new && mv pyln/$(PKG)/__init__.py.new pyln/$(PKG)/__init__.py
$(SDIST_FILE) $(BDIST_FILE): pyproject.toml $(SDIST_FILE) $(BDIST_FILE):
poetry build poetry build
test-release: check $(ARTEFACTS) pyproject.toml prod-release: check-version $(ARTEFACTS)
# No way of saying "it's ok if files exist" yet poetry publish
poetry publish --repository testpypi || /bin/true
echo Sleeping for PyPI index to update
sleep 10
# Generate a requirements.txt file, needed for us to download requirements from the prod pypi instead of the test pypi, since some packages are not published to test pypi.
poetry export -f requirements.txt --output requirements.txt --without-hashes
# 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-${PKG} already installed).
virtualenv testpypi --python=/usr/bin/python3 --download --always-copy --clear
testpypi/bin/python3 -m pip install -r requirements.txt pytest-timeout
testpypi/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln-${PKG}==${VERSION}
testpypi/bin/python3 -c "from pyln import ${PKG};assert(${PKG}.__version__ == '$(VERSION)')"
testpypi/bin/pytest tests
rm -rf testpypi
prod-release: test-release $(ARTEFACTS)
python3 -m twine upload $(ARTEFACTS)
clean:
rm -rf testpypi

47
contrib/pyln-proto/Makefile
View File

@@ -1,8 +1,7 @@
#!/usr/bin/make #!/usr/bin/make
.PHONY: bdist sdist release check check-source check-flake8 check-mypy
PKG=proto PKG=proto
VERSION = $(shell python3 -c 'from pyln import ${PKG};print(${PKG}.__version__)') VERSION := $(shell poetry version -s)
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS =
@@ -16,7 +15,14 @@ ARTEFACTS = $(BDIST_FILE) $(SDIST_FILE)
check: check-source check-pytest check: check-source check-pytest
check-source: check-flake8 check-mypy check-source: check-flake8 check-mypy check-version
# We want to create an env for this directory.
check-version:
poetry env remove -q python3 || true
poetry env use python3
poetry install
[ "`poetry run python3 -c 'from pyln import $(PKG); print($(PKG).__version__)'`" = "$(VERSION)" ] || exit 1
check-flake8: check-flake8:
flake8 --ignore=E501,E731,W503,E741 pyln tests flake8 --ignore=E501,E731,W503,E741 pyln tests
@@ -30,30 +36,15 @@ check-mypy:
pyproject.toml: pyln/${PKG}/__init__.py pyproject.toml: pyln/${PKG}/__init__.py
poetry version ${VERSION} poetry version ${VERSION}
$(SDIST_FILE) $(BDIST_FILE): pyproject.toml # Having versions in two places sucks, but so does every other option :(
# See https://github.com/python-poetry/poetry/issues/144
upgrade-version:
if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
poetry version $(NEW_VERSION)
sed 's/^__version__ = .*/__version__ = "$(NEW_VERSION)"/' < pyln/$(PKG)/__init__.py > pyln/$(PKG)/__init__.py.new && mv pyln/$(PKG)/__init__.py.new pyln/$(PKG)/__init__.py
$(SDIST_FILE) $(BDIST_FILE):
poetry build poetry build
test-release: check $(ARTEFACTS) pyproject.toml prod-release: check-version $(ARTEFACTS)
# No way of saying "it's ok if files exist" yet poetry publish
poetry publish --repository testpypi || /bin/true
echo Sleeping for PyPI index to update
sleep 10
# Generate a requirements.txt file, needed for us to download requirements from the prod pypi instead of the test pypi, since some packages are not published to test pypi.
poetry export -f requirements.txt --output requirements.txt --without-hashes
# 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-${PKG} already installed).
virtualenv testpypi --python=/usr/bin/python3 --download --always-copy --clear
testpypi/bin/python3 -m pip install -r requirements.txt pytest-timeout
testpypi/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln-${PKG}==${VERSION}
testpypi/bin/python3 -c "from pyln import ${PKG};assert(${PKG}.__version__ == '$(VERSION)')"
testpypi/bin/pytest tests
rm -rf testpypi
prod-release: test-release $(ARTEFACTS)
python3 -m twine upload $(ARTEFACTS)
clean:
rm -rf testpypi

48
contrib/pyln-testing/Makefile
View File

@@ -1,8 +1,7 @@
#!/usr/bin/make #!/usr/bin/make
.PHONY: bdist sdist release check check-source check-flake8 check-mypy
PKG=testing PKG=testing
VERSION = $(shell python3 -c 'from pyln import ${PKG};print(${PKG}.__version__)') VERSION := $(shell poetry version -s)
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS =
@@ -16,7 +15,14 @@ ARTEFACTS = $(BDIST_FILE) $(SDIST_FILE)
check: check-source check-pytest check: check-source check-pytest
check-source: check-flake8 check-mypy check-source: check-flake8 check-mypy check-version
# We want to create an env for this directory.
check-version:
poetry env remove -q python3 || true
poetry env use python3
poetry install
[ "`poetry run python3 -c 'from pyln import $(PKG); print($(PKG).__version__)'`" = "$(VERSION)" ] || exit 1
check-flake8: check-flake8:
flake8 --ignore=E501,E731,W503,E741 --exclude '*_pb2*.py,grpc2py.py' pyln tests flake8 --ignore=E501,E731,W503,E741 --exclude '*_pb2*.py,grpc2py.py' pyln tests
@@ -27,33 +33,15 @@ check-pytest:
check-mypy: check-mypy:
# MYPYPATH=$(PYTHONPATH) mypy --namespace-packages --follow-imports=skip tests pyln # MYPYPATH=$(PYTHONPATH) mypy --namespace-packages --follow-imports=skip tests pyln
pyproject.toml: pyln/${PKG}/__init__.py # Having versions in two places sucks, but so does every other option :(
poetry version ${VERSION} # See https://github.com/python-poetry/poetry/issues/144
upgrade-version:
if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
poetry version $(NEW_VERSION)
sed 's/^__version__ = .*/__version__ = "$(NEW_VERSION)"/' < pyln/$(PKG)/__init__.py > pyln/$(PKG)/__init__.py.new && mv pyln/$(PKG)/__init__.py.new pyln/$(PKG)/__init__.py
$(SDIST_FILE) $(BDIST_FILE): pyproject.toml $(SDIST_FILE) $(BDIST_FILE):
poetry build poetry build
test-release: check $(ARTEFACTS) pyproject.toml prod-release: check-version $(ARTEFACTS)
# No way of saying "it's ok if files exist" yet poetry publish
poetry publish --repository testpypi || /bin/true
echo Sleeping for PyPI index to update
sleep 10
# Generate a requirements.txt file, needed for us to download requirements from the prod pypi instead of the test pypi, since some packages are not published to test pypi.
poetry export -f requirements.txt --output requirements.txt --without-hashes
# 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-${PKG} already installed).
virtualenv testpypi --python=/usr/bin/python3 --download --always-copy --clear
testpypi/bin/python3 -m pip install -r requirements.txt pytest-timeout
testpypi/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln-${PKG}==${VERSION}
testpypi/bin/python3 -c "from pyln import ${PKG};assert(${PKG}.__version__ == '$(VERSION)')"
testpypi/bin/pytest tests
rm -rf testpypi
prod-release: test-release $(ARTEFACTS)
python3 -m twine upload $(ARTEFACTS)
clean:
rm -rf testpypi