[CI] Fix release job

3liz · Nov 14, 2024 · faa0841 · faa0841
1 parent e84ffa7
commit faa0841
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -32,6 +32,28 @@ tests:
     matrix:
     - QGIS_FLAVOR: ['ltr', 'release', '3.28']
 
+# --------
+# Build
+# -------
+
+build: 
+  image: ${REGISTRY_URL}/factory-ci-runner:python
+  stage: build
+  script:
+    - source ~/.bashrc
+    - make dist deliver
+  environment:
+    name: snap
+  tags:
+    - infrav3-plain
+  only:
+    refs:
+      - tags
+      - master
+  except:
+    - schedules
+    - triggers
+
 # Docker build 
 include: '/docker/.gitlab-ci.yml'
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,9 @@
 
 ## Unreleased
 
+## 1.9.0 - 2024-11-13
+
 * Remove support for Qgis < 3.28
-* Requires python 3.10+
 * Remove dependency on 3liz/qgis-platform images for tests
 * Remove deprecated store apis:
     - `/store/`

diff --git a/Makefile b/Makefile
@@ -14,6 +14,8 @@ PYTHON_PKG=pyqgiswps pyqgisservercontrib
 
 TESTDIR=tests/unittests
 
+PYPISERVER:=storage
+
 dirs:
 	mkdir -p $(DIST)
 
@@ -27,7 +29,7 @@ manifest: version
     echo commitid=$(COMMITID) >> $(MANIFEST)
 
 deliver:
-	twine upload -r storage $(DIST)/*
+	twine upload $(TWINE_OPTIONS) -r $(PYPISERVER) $(DIST)/*
 
 dist: dirs manifest
 	rm -rf *.egg-info 

diff --git a/docker/.gitignore b/docker/.gitignore
@@ -1 +1 @@
-factory.*.manifest
+factory-*.manifest
diff --git a/docker/.gitlab-ci.yml b/docker/.gitlab-ci.yml
@@ -66,11 +66,12 @@ deploy:snap:
   image: ${REGISTRY_URL}/factory-ci-runner:build-package
   stage: release
   script:
-    - $FACTORY_SCRIPTS/release-image.sh qgis-wps-server-$QGIS_FLAVOR
-    - $FACTORY_SCRIPTS/push-to-docker-hub.sh --clean
+    - release-image qgis-wps-server-$QGIS_FLAVOR
+    - push-to-docker-hub --clean
   environment:
     name: production
   when: manual
+  allow_failure: false
   only:
     refs:
       - tags

diff --git a/docker/Makefile b/docker/Makefile
@@ -30,7 +30,7 @@ BUILD_ARGS += --build-arg REGISTRY_PREFIX=$(REGISTRY_PREFIX)
 
 BUILDIMAGE:=$(NAME):$(FLAVOR)-$(COMMITID)
 
-MANIFEST=factory.$(FLAVOR).manifest
+MANIFEST=factory-$(FLAVOR).manifest
 
 # Use buildkit 
 export DOCKER_BUILDKIT=1

diff --git a/pyproject.toml b/pyproject.toml
@@ -6,12 +6,13 @@ build-backend = "setuptools.build_meta"
 name = "py-qgis-wps"
 description = "Py-Qgis-WPS is an implementation of the Web Processing Service standard from the Open Geospatial Consortium"
 readme = "README.md"
-requires-python = ">= 3.10"
+requires-python = ">= 3.9"
 classifiers=[
     "Environment :: Web Environment",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
     "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",