Merge pull request #378 from jef-n/main

updates

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,15 +66,14 @@ 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"
 	@echo "------------------------------------------------------------------"
 	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 "------------------------------------------------------------------"

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"

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:
 

data/conf.json

@@ -2,10 +2,10 @@
     "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": "\\u200B",
+    "releasenote": "",
     "ltrversion": "3.34",
     "ltrrelease": "3.34.9",
     "ltrcodename": "Prizren",

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 -}}

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 }}|<html><body>
+<ul>
+<li>The current available LTR version of QGIS is {{ .ltrrelease }}.
+<li>The latest available version of QGIS is {{ .release }}.
+<li>We are working on {{ .devversion }}-Master. It will go into feature freeze on {{ .nextfreezedate }} and be released as {{ .nextversion }} on {{ .nextreleasedate }}.
+<li>Details on changes can be found on github at <a href="https://github.com/qgis/QGIS/commits/master">https://github.com/qgis/QGIS/commits/master</a>.
+</body>
+</html>
+{{- end -}}

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 }}|<html><body>
+<ul>
+<li>The current released version of QGIS is {{ .release }}.
+<li>We are working on {{ .devversion }}-Master. It will go into feature freeze on {{ .nextfreezedate }} and be released as {{ .nextversion }} on {{ .nextreleasedate }}.
+<li>Details on changes can be found on github at <a href="https://github.com/qgis/QGIS/commits/master">https://github.com/qgis/QGIS/commits/master</a>.
+</body>
+</html>
+{{- end -}}

scripts/update-schedule.py

@@ -236,10 +236,10 @@ 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 '\\u200B'),
+        "releasenote": lr_note if lr_note != '' else ('RC' if lr_version.split('.')[2] == '0' else ''),
         "ltrversion": ltrversion,
         "ltrrelease": ltr_version,
         "ltrcodename": ltr_name,