feat: replace poetry with uv in Makefiles

king-11 · king-11 · commit 9d67e52cdcb1 · 2025-05-10T10:13:24.000+05:30
Extract package versions from pyproject.toml directly
instead of using poetry commands. Use `uv run` to execute flake8,
pytest and other Python tools consistently.
diff --git a/Makefile b/Makefile
@@ -477,11 +477,11 @@ check: check-units installcheck pytest
 
 pytest: $(ALL_PROGRAMS) $(DEFAULT_TARGETS) $(ALL_TEST_PROGRAMS) $(ALL_TEST_GEN)
 ifeq ($(PYTEST),)
-	@echo "py.test is required to run the integration tests, please install using 'pip3 install -r requirements.txt', and rerun 'configure'."
+	@echo "pytest is required to run the integration tests, please install using 'uv sync --all-extras --all-groups', and rerun 'configure'."
 	exit 1
 else
 # Explicitly hand VALGRIND so you can override on make cmd line.
-	PYTHONPATH=$(MY_CHECK_PYTHONPATH) TEST_DEBUG=1 VALGRIND=$(VALGRIND) $(PYTEST) $(PYTEST_TESTS) $(PYTEST_OPTS)
+	PYTHONPATH=$(MY_CHECK_PYTHONPATH) TEST_DEBUG=1 VALGRIND=$(VALGRIND) uv run $(PYTEST) $(PYTEST_TESTS) $(PYTEST_OPTS)
 endif
 
 check-fuzz: $(ALL_FUZZ_TARGETS)
@@ -542,7 +542,7 @@ PYSRC=$(shell git ls-files "*.py" | grep -v /text.py)
 # allows it to find that
 PYLN_PATH=$(shell pwd)/lightningd:$(PATH)
 check-pyln-%: $(BIN_PROGRAMS) $(PKGLIBEXEC_PROGRAMS) $(PLUGINS)
-	@(cd contrib/$(shell echo $@ | cut -b 7-) && PATH=$(PYLN_PATH) PYTHONPATH=$(MY_CHECK_PYTHONPATH) $(MAKE) check)
+	@(cd contrib/$(shell echo $@ | cut -b 7-) && PATH=$(PYLN_PATH) PYTHONPATH=$(MY_CHECK_PYTHONPATH) uv run $(MAKE) check)
 
 check-python: check-python-flake8 check-pytest-pyln-proto check-pyln-client check-pyln-testing
 
@@ -551,10 +551,10 @@ check-python-flake8:
 	@# E731 do not assign a lambda expression, use a def
 	@# W503: line break before binary operator
 	@# E741: ambiguous variable name
-	@flake8 --ignore=E501,E731,E741,W503,F541,E275 --exclude $(shell echo ${PYTHON_GENERATED} | sed 's/ \+/,/g') ${PYSRC}
+	@uv run flake8 --ignore=E501,E731,E741,W503,F541,E275 --exclude $(shell echo ${PYTHON_GENERATED} | sed 's/ \+/,/g') ${PYSRC}
 
 check-pytest-pyln-proto:
-	PATH=$(PYLN_PATH) PYTHONPATH=$(MY_CHECK_PYTHONPATH) $(PYTEST) contrib/pyln-proto/tests/
+	PATH=$(PYLN_PATH) PYTHONPATH=$(MY_CHECK_PYTHONPATH) uv run $(PYTEST) contrib/pyln-proto/tests/
 
 check-includes: check-src-includes check-hdr-includes
 	@tools/check-includes.sh
@@ -745,29 +745,19 @@ clean: obsclean
 	find . -name '*gcno' -delete
 	find . -name '*.nccout' -delete
 	if [ "${RUST}" -eq "1" ]; then cargo clean; fi
+	rm -rf .venv
 
 
 PYLNS=client proto testing
 # See doc/contribute-to-core-lightning/contributor-workflow.md
-update-versions: update-pyln-versions update-wss-proxy-version update-poetry-lock update-dot-version update-doc-examples
-
-update-pyln-versions: $(PYLNS:%=update-pyln-version-%)
-
-update-pyln-version-%:
-	@if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
-	cd contrib/pyln-$* && $(MAKE) upgrade-version
 
 pyln-release:  $(PYLNS:%=pyln-release-%)
 
 pyln-release-%:
 	cd contrib/pyln-$* && $(MAKE) prod-release
 
-update-wss-proxy-version:
-	@if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
-	cd plugins/wss-proxy && $(MAKE) upgrade-version
-
-update-poetry-lock:
-	poetry update wss-proxy pyln-client pyln-proto pyln-testing update-reckless-version
+update-lock:
+	uv sync --all-extras --all-groups
 
 update-reckless-version:
 	@if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
diff --git a/contrib/pyln-client/Makefile b/contrib/pyln-client/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make
 
 PKG=client
-VERSION := $(shell poetry version -s)
+VERSION := $(shell grep 'version' pyproject.toml | head -n1 | cut -d'"' -f2)
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
@@ -17,31 +17,20 @@ check: check-source check-pytest
 
 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
+	[ "`uv run python3 -c 'from pyln import $(PKG); print($(PKG).__version__)'`" = "$(VERSION)" ] || exit 1
 
 check-flake8:
-	flake8 --ignore=E501,E731,W503,E741 pyln tests
+	uv run flake8 --ignore=E501,E731,W503,E741 pyln tests
 
 check-pytest:
-	pytest tests
+	uv run pytest tests
 
 check-mypy:
 #	MYPYPATH=$(PYTHONPATH) mypy --namespace-packages --follow-imports=skip tests pyln
 
-# 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
+	uv build
 
 prod-release: check-version $(ARTEFACTS)
-	poetry publish
+	uv publish
diff --git a/contrib/pyln-grpc-proto/Makefile b/contrib/pyln-grpc-proto/Makefile
@@ -2,7 +2,7 @@
 .PHONY: clean protos
 
 PKG=grpc
-VERSION := $(shell poetry version -s)
+VERSION := $(shell grep 'version' pyproject.toml | head -n1 | cut -d'"' -f2)
 
 PROTOS = \
 	pyln/grpc/node_pb2.py \
@@ -16,7 +16,7 @@ PROTOSRC = \
 	../../cln-grpc/proto/primitives.proto
 
 ${PROTOS} &: ${PROTOSRC}
-	python \
+	uv run \
 	  -m grpc_tools.protoc \
 	  -I ../../cln-grpc/proto \
 	  ../../cln-grpc/proto/node.proto \
@@ -40,13 +40,6 @@ ${PROTOS} &: ${PROTOSRC}
 	sed -i 's/import primitives_pb2/from pyln.grpc import primitives_pb2/g' pyln/grpc/node_pb2.pyi
 	sed -i 's/import node_pb2 as node__pb2/from pyln.grpc import node_pb2 as node__pb2/g' pyln/grpc/node_pb2_grpc.py
 
-# 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
-
 protos: ${PROTOS}
 
 clean:
diff --git a/contrib/pyln-proto/Makefile b/contrib/pyln-proto/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make
 
 PKG=proto
-VERSION := $(shell poetry version -s)
+VERSION := $(shell grep 'version' pyproject.toml | head -n1 | cut -d'"' -f2)
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
@@ -19,32 +19,19 @@ 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
+	[ "`uv run python3 -c 'from pyln import $(PKG); print($(PKG).__version__)'`" = "$(VERSION)" ] || exit 1
 
 check-flake8:
-	flake8 --ignore=E501,E731,W503,E741 pyln tests
+	uv run flake8 --ignore=E501,E731,W503,E741 pyln tests
 
 check-pytest:
-	pytest tests
+	uv run pytest tests
 
 check-mypy:
 #	MYPYPATH=$(PYTHONPATH) mypy --namespace-packages --follow-imports=skip tests pyln
 
-pyproject.toml: pyln/${PKG}/__init__.py
-	poetry version ${VERSION}
-
-# 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
+	uv build
 
 prod-release: check-version $(ARTEFACTS)
-	poetry publish
+	uv publish
diff --git a/contrib/pyln-testing/Makefile b/contrib/pyln-testing/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make
 
 PKG=testing
-VERSION := $(shell poetry version -s)
+VERSION := $(shell grep 'version' pyproject.toml | head -n1 | cut -d'"' -f2)
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
@@ -19,29 +19,19 @@ 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
+	[ "`uv run python3 -c 'from pyln import $(PKG); print($(PKG).__version__)'`" = "$(VERSION)" ] || exit 1
 
 check-flake8:
-	flake8 --ignore=E501,E731,W503,E741  --exclude '*_pb2*.py,grpc2py.py' pyln tests
+	uv run flake8 --ignore=E501,E731,W503,E741  --exclude '*_pb2*.py,grpc2py.py' pyln tests
 
 check-pytest:
-	pytest tests
+	uv run pytest tests
 
 check-mypy:
 #	MYPYPATH=$(PYTHONPATH) mypy --namespace-packages --follow-imports=skip tests pyln
 
-# 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
+	uv build
 
 prod-release: check-version $(ARTEFACTS)
-	poetry publish
+	uv publish
diff --git a/doc/developers-guide/app-development/grpc.md b/doc/developers-guide/app-development/grpc.md
@@ -35,18 +35,10 @@ The gRPC interface is described in the [protobuf file](https://github.com/Elemen
 
 In this tutorial, we walk through the steps for Python, however they are mostly the same for other languages. For instance, if you're developing in Rust, use [`tonic-build`](https://docs.rs/tonic-build/latest/tonic_build/) to generate the bindings. For other languages, see the official [gRPC docs](https://grpc.io/docs/languages/) on how to generate gRPC client library for your specific language using the protobuf file.
 
-We start by downloading the dependencies and `protoc` compiler:
-
-```shell
-pip install grpcio-tools
-```
-
-
-
-Next we generate the bindings in the current directory:
+We generate the bindings in the current directory:
 
 ```bash
-python -m grpc_tools.protoc \
+uv run -m grpc_tools.protoc \
   -I path/to/cln-grpc/proto \
   path/to/cln-grpc/proto/node.proto \
   --python_out=. \
diff --git a/plugins/grpc-plugin/README.md b/plugins/grpc-plugin/README.md
@@ -23,7 +23,7 @@ if they don't already exist:
  - `client.pem` and `client-key.pem`: this is an example identity that
    can be used by a client to connect to the plugin, and issue
    requests. It is also signed by the CA.
-   
+
 These files are generated with sane defaults, however you can generate
 custom certificates should you require some changes (see below for
 details).
@@ -39,16 +39,10 @@ bindings.
 In this example we walk through the steps for python, however they are
 mostly the same for other languages.
 
-We start by downloading the dependencies and `protoc` compiler:
-
-```bash
-pip install grpcio-tools
-```
-
-Next we generate the bindings in the current directory:
+We generate the bindings in the current directory:
 
 ```bash
-python -m grpc_tools.protoc \
+uv run -m grpc_tools.protoc \
   -I path/to/cln-grpc/proto \
   path/to/cln-grpc/proto/node.proto \
   --python_out=. \
@@ -62,7 +56,7 @@ This will generate two files in the current directory:
    exchanging with the server.
  - `node_pb2_grpc.py`: the service and method stubs representing the
    server-side methods as local objects and associated methods.
-   
+
 And finally we can use the generated stubs and mTLS identity to
 connect to the node:
 
diff --git a/plugins/wss-proxy/Makefile b/plugins/wss-proxy/Makefile
@@ -1,3 +1 @@
-upgrade-version:
-	if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
-	poetry version $(NEW_VERSION)
+
