From e3213d9d38331065ab7770da53848ba891968032 Mon Sep 17 00:00:00 2001 From: Jean Felder Date: Fri, 3 Jan 2025 08:39:21 +0100 Subject: [PATCH 1/3] makefile: Remove trailing whitespaces --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 14b1fab..5b207f5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: test -# +# # qypws makefile # DEPTH=. @@ -32,7 +32,7 @@ deliver: twine upload $(TWINE_OPTIONS) -r $(PYPISERVER) $(DIST)/* dist: dirs manifest - rm -rf *.egg-info + rm -rf *.egg-info $(PYTHON) -m build --no-isolation --sdist --outdir=$(DIST) clean: @@ -70,4 +70,3 @@ client-test: scan: @bandit -c pyproject.toml -r pyqgiswps - From 15890ad57549a696b980a0edc7e763fb5c23dfd9 Mon Sep 17 00:00:00 2001 From: Jean Felder Date: Fri, 3 Jan 2025 08:41:04 +0100 Subject: [PATCH 2/3] makefile: Improve indentation in manifest part --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5b207f5..a12d3b5 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,9 @@ version: manifest: version echo name=$(shell $(PYTHON) setup.py --name) > $(MANIFEST) && \ - echo version=$(shell $(PYTHON) setup.py --version) >> $(MANIFEST) && \ - echo buildid=$(BUILDID) >> $(MANIFEST) && \ - echo commitid=$(COMMITID) >> $(MANIFEST) + echo version=$(shell $(PYTHON) setup.py --version) >> $(MANIFEST) && \ + echo buildid=$(BUILDID) >> $(MANIFEST) && \ + echo commitid=$(COMMITID) >> $(MANIFEST) deliver: twine upload $(TWINE_OPTIONS) -r $(PYPISERVER) $(DIST)/* From f2db6ddd0fc228a3a737213f36a19255cf2b3a3b Mon Sep 17 00:00:00 2001 From: Jean Felder Date: Fri, 3 Jan 2025 08:38:50 +0100 Subject: [PATCH 3/3] makefile: Fix manifest following the pyproject port `setup.py` does not exist anymore. --- Makefile | 4 ++-- config.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a12d3b5..dd36a92 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ version: echo $(VERSION_TAG) > VERSION manifest: version - echo name=$(shell $(PYTHON) setup.py --name) > $(MANIFEST) && \ - echo version=$(shell $(PYTHON) setup.py --version) >> $(MANIFEST) && \ + echo name=$(PROJECT_NAME) > $(MANIFEST) && \ + echo version=$(VERSION_TAG) >> $(MANIFEST) && \ echo buildid=$(BUILDID) >> $(MANIFEST) && \ echo commitid=$(COMMITID) >> $(MANIFEST) diff --git a/config.mk b/config.mk index 67fbd9a..7e23cbf 100644 --- a/config.mk +++ b/config.mk @@ -1,3 +1,5 @@ +# Name to be set in the manifest +PROJECT_NAME:=py-qgis-wps VERSION:=1.9.0