Revert "Update for 3.38.3/3.34.11 point releases"

This reverts commit 64373ce.
qgis · Sep 23, 2024 · 136a17b · 136a17b
1 parent 7909a4b
commit 136a17b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/csv/schedule.csv b/csv/schedule.csv
@@ -22,9 +22,9 @@
 "PR/FF",":rm-past:3.36.3",":rm-past:3.34.7","3.37","2024-05-17","20","5"
 "LR/PR",":rm-past:3.38.0",":rm-past:3.34.8","","2024-06-21","25","4"
 "PR",":rm-past:3.38.1",":rm-past:3.34.9","","2024-07-19","29","4"
-"PR",":rm-past:3.38.2",":rm-past:3.34.10","","2024-08-16","33","4"
-":rm-current:PR/FF",":rm-current:3.38.3",":rm-current:3.34.11","3.39","2024-09-13","37","6"
-"LTR/PR",":rm-next:3.40.0",":rm-next:3.34.12","","2024-10-25","43","4"
+":rm-current:PR",":rm-current:3.38.2",":rm-current:3.34.10","","2024-08-16","33","4"
+"PR/FF",":rm-next:3.38.3",":rm-next:3.34.11","3.39","2024-09-13","37","6"
+"LTR/PR",":rm-future:3.40.0",":rm-future:3.34.12","","2024-10-25","43","4"
 "PR",":rm-future:3.40.1",":rm-future:3.34.13","","2024-11-22","47","4"
 "PR",":rm-future:3.40.2",":rm-future:3.34.14","","2024-12-20","51","4"
 "PR/FF",":rm-future:3.40.3",":rm-future:3.34.15","3.41","2025-01-17","3","5"

diff --git a/data/conf.json b/data/conf.json
@@ -1,13 +1,13 @@
 {
     "WARNING": "produced from googlesheet via scripts/update-schedule.py - EDITS WILL BE LOST",
     "version": "3.38",
-    "release": "3.38.3",
-    "releasedate": "2024-09-13",
+    "release": "3.38.2",
+    "releasedate": "2024-08-16",
     "binary": "1",
     "codename": "Grenoble",
     "releasenote": "",
     "ltrversion": "3.34",
-    "ltrrelease": "3.34.11",
+    "ltrrelease": "3.34.10",
     "ltrcodename": "Prizren",
     "ltrbinary": "1",
     "ltrnote": "LTR",
@@ -16,18 +16,18 @@
     "nextversion": "3.40",
     "nextfreezedate": "2024-09-13 12:00:00 UTC",
     "nextreleasedate": "2024-10-25 12:00:00 UTC",
-    "nextpointreleasedate": "2024-10-25 12:00:00 UTC",
-    "infeaturefreeze": true,
-    "next_ltr_version": "3.34.12",
-    "next_lr_version": "3.40.0",
+    "nextpointreleasedate": "2024-09-13 12:00:00 UTC",
+    "infeaturefreeze": false,
+    "next_ltr_version": "3.34.11",
+    "next_lr_version": "3.38.3",
     "yeartag": "%%Y",
     "devcite": "https://docs.qgis.org/3.34/en/docs/developers_guide/index.html",
     "userguidecite": "https://docs.qgis.org/3.34/en/docs/user_manual/index.html",
     "servercite": "https://docs.qgis.org/3.34/en/docs/server_manual/index.html",
     "apicite": "/pyqgis/3.34/index.html",
-    "lr_msi": "/downloads/QGIS-OSGeo4W-3.38.3-1.msi",
-    "lr_sha": "/downloads/QGIS-OSGeo4W-3.38.3-1.sha256sum",
-    "ltr_msi": "/downloads/QGIS-OSGeo4W-3.34.11-1.msi",
-    "ltr_sha": "/downloads/QGIS-OSGeo4W-3.34.11-1.sha256sum",
+    "lr_msi": "/downloads/QGIS-OSGeo4W-3.38.2-1.msi",
+    "lr_sha": "/downloads/QGIS-OSGeo4W-3.38.2-1.sha256sum",
+    "ltr_msi": "/downloads/QGIS-OSGeo4W-3.34.10-1.msi",
+    "ltr_sha": "/downloads/QGIS-OSGeo4W-3.34.10-1.sha256sum",
     "weekly_msi": "https://download.osgeo.org/qgis/windows/weekly/?C=M&O=D"
 }
diff --git a/scripts/update-schedule.py b/scripts/update-schedule.py
@@ -215,7 +215,7 @@ def adduid(ev, uid):
     print(f"{v}:{n}")
     url = "https://raw.githubusercontent.com/qgis/QGIS/release-{0}/CMakeLists.txt".format("_".join(v.split('.')[:2]))
     cm = urlopen(url).read().decode('utf-8')
-    rn = re.search("^set\\(RELEASE_NAME \"(.*)\"\\)$", cm, re.MULTILINE).group(1)
+    rn = re.search("^set\(RELEASE_NAME \"(.*)\"\)$", cm, re.MULTILINE).group(1)
     assert n==rn, f"Expected {n}, found {rn}"
 
 assert lr_version.split(".") > ltr_version.split("."), f"LR {lr_version} not higher than {ltr_version}"