From b2bd4076565f005d8b60efc54c08901a5c2568e1 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 23 Jul 2024 15:13:55 +0200 Subject: [PATCH 1/3] include noble-ubuntugis --- content/resources/installation-guide/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/resources/installation-guide/index.md b/content/resources/installation-guide/index.md index aff4f626a..5619c6f5e 100644 --- a/content/resources/installation-guide/index.md +++ b/content/resources/installation-guide/index.md @@ -209,12 +209,12 @@ Next release: {{< param "nextreleasedate" >}} |Debian|12.x (stable)|bookworm|| ||11.x (oldstable)|bullseye|| ||unstable|sid|| -|Ubuntu|24.04 (LTS) [[6]](#id6)|noble|| +|Ubuntu|24.04 (LTS)|noble|yes [[6]](#id6)| ||23.10|mantic|| ||23.04|lunar|| ||22.04 (LTS)|jammy|yes| -{{< footnote "6" >}} future ubuntu release planned for 2024-04-25 +{{< footnote "6" >}} starting with nightlies of 3.34.9/3.38.2 To use the QGIS archive you have to first add the archive’s repository public key: From 77be0de3d90b5e689328d1808055478fdfc266c9 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 23 Jul 2024 15:39:34 +0200 Subject: [PATCH 2/3] fix empty releasenote (fixes #370) --- data/conf.json | 2 +- scripts/update-schedule.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/conf.json b/data/conf.json index 97c58456d..3ddb34787 100644 --- a/data/conf.json +++ b/data/conf.json @@ -5,7 +5,7 @@ "releasedate": "19.07.2024", "binary": "1", "codename": "Grenoble", - "releasenote": "\\u200B", + "releasenote": "", "ltrversion": "3.34", "ltrrelease": "3.34.9", "ltrcodename": "Prizren", diff --git a/scripts/update-schedule.py b/scripts/update-schedule.py index e20a0c0d5..adb576e51 100755 --- a/scripts/update-schedule.py +++ b/scripts/update-schedule.py @@ -239,7 +239,7 @@ def adduid(ev, uid): "releasedate": lr_date.strftime("%d.%m.%Y"), "binary": lr_binary, "codename": lr_name, - "releasenote": lr_note if lr_note != '' else ('RC' if lr_version.split('.')[2] == '0' else '\\u200B'), + "releasenote": lr_note if lr_note != '' else ('RC' if lr_version.split('.')[2] == '0' else ''), "ltrversion": ltrversion, "ltrrelease": ltr_version, "ltrcodename": ltr_name, From a32f4adec2c6f9207fd1cb02e98cca4fa923b3e0 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 29 Jul 2024 01:43:53 +0200 Subject: [PATCH 3/3] generate version files (fixes #372) --- Makefile | 5 ++--- config.toml | 22 ++++++++++++++----- data/conf.json | 2 +- layouts/index.version-json.json | 39 +++++++++++++++++++++++++++++++++ layouts/index.version-ltr.txt | 11 ++++++++++ layouts/index.version.txt | 10 +++++++++ scripts/update-schedule.py | 2 +- 7 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 layouts/index.version-json.json create mode 100644 layouts/index.version-ltr.txt create mode 100644 layouts/index.version.txt diff --git a/Makefile b/Makefile index 6fc3069d1..4ae6187b7 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ help: # ---------------------------------------------------------------------------- # D O C K E R C O M M A N D S # ---------------------------------------------------------------------------- - + dev-build: ## Generate the development docker container docker build --rm -f Dockerfile.dev -t qgis_hugo_dev:latest . @@ -66,7 +66,7 @@ revert-deploy: ## Revert the site for nocache.qgis.org, www.qgis.org and qgis.or # D E V E L O P M E N T C O M M A N D S # ---------------------------------------------------------------------------- -hugo-dev-build: ## Build the site localy and run a python server at localhost:8000 with hugo +hugo-dev-build: ## Build the site locally and run a python server at localhost:8000 with hugo @echo @echo "------------------------------------------------------------------" @echo "Building site in development" @@ -74,7 +74,6 @@ hugo-dev-build: ## Build the site localy and run a python server at localhost:80 hugo --config config.toml,config/config.dev.toml python3 -m http.server 8000 -d public_dev - hugo-run-dev: ## Run the server at localhost:1313 with hugo @echo @echo "------------------------------------------------------------------" diff --git a/config.toml b/config.toml index 3b795e458..33959907d 100644 --- a/config.toml +++ b/config.toml @@ -145,8 +145,6 @@ sectionPagesMenu = 'main' url = "/project/overview/" weight = 10 - - [[menu.main]] parent = "Project" name = "Case studies" @@ -450,7 +448,6 @@ sectionPagesMenu = 'main' url = "/resources/support/#stackexchange" weight = 160 - [[menu.main]] parent = "Resources" name = "Blog" @@ -464,5 +461,20 @@ sectionPagesMenu = 'main' weight = 190 [outputs] - home = ["HTML", "RSS", "JSON"] - + home = ["HTML", "RSS", "JSON", "version", "version-ltr", "version-json"] + +[outputFormats] +[outputFormats.version] + baseName = "version" + isPlainText = true + mediaType = "text/plain" + +[outputFormats.version-ltr] + baseName = "version-ltr" + isPlainText = true + mediaType = "text/plain" + +[outputFormats.version-json] + baseName = "version" + isPlainText = true + mediaType = "application/json" diff --git a/data/conf.json b/data/conf.json index 3ddb34787..c217e3bfe 100644 --- a/data/conf.json +++ b/data/conf.json @@ -2,7 +2,7 @@ "WARNING": "produced from googlesheet via scripts/update-schedule.py - EDITS WILL BE LOST", "version": "3.38", "release": "3.38.1", - "releasedate": "19.07.2024", + "releasedate": "2024-07-19", "binary": "1", "codename": "Grenoble", "releasenote": "", diff --git a/layouts/index.version-json.json b/layouts/index.version-json.json new file mode 100644 index 000000000..4485ab337 --- /dev/null +++ b/layouts/index.version-json.json @@ -0,0 +1,39 @@ +{{ with index .Site.Data.conf -}} +{{ $release := apply (split .release ".") "cast.ToInt" "." -}} +{{ $ltrrelease := apply (split .ltrrelease ".") "cast.ToInt" "." -}} +{{ $devversion := apply (split .devversion ".") "cast.ToInt" "." -}} +{ + "latest": { + "versionint": {{ printf "%d%02d%02d" (index $release 0) (index $release 1) (index $release 2) }}, + "version": "{{ .version }}", + "name": "{{ .codename }}", + "note": "{{ .releasenote }}", + "binary": "{{ .binary }}", + "date": "{{ .releasedate }}", + "major": {{ index $release 0 }}, + "minor": {{ index $release 1 }}, + "patch": {{ index $release 2 }} + }, + "ltr": { + "versionint": {{ printf "%d%02d%02d" (index $ltrrelease 0) (index $ltrrelease 1) (index $ltrrelease 2) }}, + "version": "{{ .Params.ltrversion }}", + "name": "{{ .ltrcodename }}", + "note": "{{ .ltrreleasenote }}", + "binary": "{{ .ltrbinary }}", + "date": "{{ .ltrreleasedate }}", + "major": {{ index $ltrrelease 0 }}, + "minor": {{ index $ltrrelease 1 }}, + "patch": {{ index $ltrrelease 2 }} + }, + "dev": { + "version": "{{ .devversion }}", + "versionint": {{ printf "%d%02d%02d" (index $devversion 0) (index $devversion 1) 0 }}, + "major": {{ index $devversion 0 }}, + "minor": {{ index $devversion 1 }}, + "patch": 0 + }, + "freezedate": "{{ .nextfreezedate }}", + "nextreleasedate": "{{ .nextreleasedate }}", + "nextversion": "{{ .nextversion }}" +} +{{- end -}} diff --git a/layouts/index.version-ltr.txt b/layouts/index.version-ltr.txt new file mode 100644 index 000000000..67c49db57 --- /dev/null +++ b/layouts/index.version-ltr.txt @@ -0,0 +1,11 @@ +{{ with index .Site.Data.conf -}} +{{ $release := apply (split .ltrrelease ".") "cast.ToInt" "." -}} +#QGIS Version {{ (printf "%d%02d%02d" (index $release 0) (index $release 1) (index $release 2)) }}|Visit https://download.qgis.org to get your copy of version {{ .ltrrelease }}| +
    +
  • The current available LTR version of QGIS is {{ .ltrrelease }}. +
  • The latest available version of QGIS is {{ .release }}. +
  • We are working on {{ .devversion }}-Master. It will go into feature freeze on {{ .nextfreezedate }} and be released as {{ .nextversion }} on {{ .nextreleasedate }}. +
  • Details on changes can be found on github at https://github.com/qgis/QGIS/commits/master. + + +{{- end -}} diff --git a/layouts/index.version.txt b/layouts/index.version.txt new file mode 100644 index 000000000..45ec9bddd --- /dev/null +++ b/layouts/index.version.txt @@ -0,0 +1,10 @@ +{{ with index .Site.Data.conf -}} +{{ $release := apply (split .release ".") "cast.ToInt" "." -}} +#QGIS Version {{ (printf "%d%02d%02d" (index $release 0) (index $release 1) (index $release 2)) }}|Visit https://download.qgis.org to get your copy of version {{ .release }}| +
      +
    • The current released version of QGIS is {{ .release }}. +
    • We are working on {{ .devversion }}-Master. It will go into feature freeze on {{ .nextfreezedate }} and be released as {{ .nextversion }} on {{ .nextreleasedate }}. +
    • Details on changes can be found on github at https://github.com/qgis/QGIS/commits/master. + + +{{- end -}} diff --git a/scripts/update-schedule.py b/scripts/update-schedule.py index adb576e51..23089be0f 100755 --- a/scripts/update-schedule.py +++ b/scripts/update-schedule.py @@ -236,7 +236,7 @@ def adduid(ev, uid): "WARNING": "produced from googlesheet via scripts/update-schedule.py - EDITS WILL BE LOST", "version": ".".join(lr_version.split(".")[:2]), "release": lr_version, - "releasedate": lr_date.strftime("%d.%m.%Y"), + "releasedate": lr_date.strftime("%Y-%m-%d"), "binary": lr_binary, "codename": lr_name, "releasenote": lr_note if lr_note != '' else ('RC' if lr_version.split('.')[2] == '0' else ''),