From d1fccb7929ef4723808e8c92df597577553b67e2 Mon Sep 17 00:00:00 2001 From: sleeping Date: Fri, 23 Feb 2024 21:57:05 +0400 Subject: [PATCH 1/3] release schedule automation --- content/download/index.md | 52 +++++---- content/resources/installation-guide/index.md | 104 +++++++++--------- content/resources/roadmap.md | 2 +- content/resources/support/bug-reporting.md | 2 +- content/resources/support/faq.md | 22 ++-- csv/schedule.csv | 6 +- data/conf.json | 30 +++++ scripts/schedule.py | 25 ----- scripts/update-schedule.py | 88 +++++++-------- .../layouts/shortcodes/download-macos.html | 11 ++ ...forms.html => download-platforms-end.html} | 7 -- .../shortcodes/download-platforms-start.html | 16 +++ .../layouts/shortcodes/download-windows.html | 23 ++++ .../layouts/shortcodes/param-link.html | 1 + .../layouts/shortcodes/param.html | 1 + .../layouts/shortcodes/spoiler-end.html | 2 + .../layouts/shortcodes/spoiler-start.html | 3 + .../layouts/shortcodes/spoiler.html | 11 -- 18 files changed, 220 insertions(+), 186 deletions(-) create mode 100644 data/conf.json delete mode 100644 scripts/schedule.py create mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-macos.html rename themes/hugo-bulma-blocks-theme/layouts/shortcodes/{download-platforms.html => download-platforms-end.html} (88%) create mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-platforms-start.html create mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-windows.html create mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/param-link.html create mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/param.html create mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/spoiler-end.html create mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/spoiler-start.html delete mode 100644 themes/hugo-bulma-blocks-theme/layouts/shortcodes/spoiler.html diff --git a/content/download/index.md b/content/download/index.md index d6d01ad18..f71bf3cc5 100644 --- a/content/download/index.md +++ b/content/download/index.md @@ -28,19 +28,14 @@ We use the stripe.com service to receive credit card donations. Note that the pa {{< hide-donate-prompt >}} -{{< download-platforms >}} +{{< download-platforms-start >}} -{{< spoiler id="download-win" title="Download for Windows" >}} -{{< button class="button is-primary1" link="https://qgis.org/downloads/QGIS-OSGeo4W-3.34.3-1.msi" text="Download QGIS 3.34" >}} -{{< button class="button is-primary1 is-outlined" link="https://qgis.org/downloads/QGIS-OSGeo4W-3.28.15-1.msi" text="QGIS 3.28 LTR" >}} +{{< spoiler-start id="download-win" title="Download for Windows">}} +{{< download-windows >}} +{{< spoiler-end >}} -The OSGeo4W installer is recommended for regular users or organization deployments. It allows to have several QGIS versions in one place, and to keep each component up-to-date individually without having to download the whole package. -{{< button class="button is-primary1 is-outlined" link="resources/installation-guide#osgeo4w-installer" text="OSGeo4W Network Installer" >}} -Since QGIS 3.20 we only ship 64-bit Windows executables. -{{< /spoiler >}} - -{{< spoiler id="download-linux" title="Download for Linux" >}} +{{< spoiler-start id="download-linux" title="Download for Linux" >}} For many flavors of GNU/Linux binary packages (rpm and deb) or software repositories (to add to your installation manager) are available. Please select your choice of distro below: - [Debian/Ubuntu](../resources/installation-guide#debian-ubuntu) @@ -53,40 +48,49 @@ For many flavors of GNU/Linux binary packages (rpm and deb) or software reposito - [Spack](../resources/installation-guide#spack) [Linux Installation Instructions](../resources/installation-guide#linux) -{{< /spoiler >}} +{{< spoiler-end >}} + + +{{< spoiler-start id="download-mac" title="Download for MacOS" >}} +{{< download-macos >}} + +Alternatively, for native support of both Intel x86 and Apple ARM architectures, together with the latest versions of key components (e.g. GDAL, PDAL, GRASS GIS) see [MacPorts Installing Instructions]({{< ref "resources/installation-guide/#macports" >}}) -{{< spoiler id="download-mac" title="Download for MacOS" mode="html" >}} {{< rich-box icon="💁" layoutClass="tips">}} {{< rich-content themeClass="coloring-1" >}} ##### Tips for first launch After installing QGIS, the first launch attempt may fail due to security protections. To enable QGIS, control-click on its icon in your Applications folder and select Open in the context menu. A confirmation dialog will display where you need to click the Open button again. This only has to be done once. {{< /rich-content >}} {{< /rich-box >}} -{{< button class="button is-primary1" link="https://qgis.org/downloads/macos/qgis-macos-pr.dmg" text="Long Term Version for Mac OS (3.28 LTR)" >}} -{{< button class="button is-primary1 is-outlined" link="https://qgis.org/downloads/macos/qgis-macos-pr.dmg" text="Latest version for Mac OS (3.34)" >}} -{{< /spoiler >}} -{{< spoiler id="download-bsd" title="Download for BSD" >}} +{{< spoiler-end >}} + + +{{< spoiler-start id="download-bsd" title="Download for BSD" >}} [BSD Installation Instructions](../resources/installation-guide#freebsd) -{{< /spoiler >}} +{{< spoiler-end >}} + -{{< spoiler id="download-mobile" title="Apps for mobile and tablet" mode="html" >}} +{{< spoiler-start id="download-mobile" title="Apps for mobile and tablet" >}} {{< mobile-downloads >}} -{{< /spoiler >}} +{{< spoiler-end >}} + -{{< spoiler id="download-sources" title="Sources" >}} +{{< spoiler-start title="Sources" >}} QGIS is open source software available under the terms of the GNU General Public License meaning that its source code can be downloaded through tarballs or the git repository. QGIS Source Code is available here (latest release) and here (long term release) Refer to the INSTALL guide on how to compile QGIS from source for the different platforms: [here](https://github.com/qgis/QGIS/blob/master/INSTALL.md) -{{< /spoiler >}} +{{< spoiler-end >}} -{{< spoiler id="download-sources" title="Datasets" >}} + +{{< spoiler-start title="Datasets" >}} For testing and learning purposes, [a sample dataset is available](https://docs.qgis.org/3.28/en/docs/user_manual/introduction/getting_started.html#downloading-sample-data), which contains collections of data from different sources and in different formats. -{{< /spoiler >}} +{{< spoiler-end >}} + -{{< /download-platforms >}} +{{< download-platforms-end >}} {{< script src="js/spoiler.js" >}} diff --git a/content/resources/installation-guide/index.md b/content/resources/installation-guide/index.md index 9915d0c79..4c2eae15d 100644 --- a/content/resources/installation-guide/index.md +++ b/content/resources/installation-guide/index.md @@ -30,9 +30,9 @@ For beginners the easiest way is using the standalone installers: |Release|Version|Package| |---|---|---| -|Latest Release|3.34.3 Prizren ​|[Installer](https://qgis.org/downloads/QGIS-OSGeo4W-3.34.3-1.msi) [Checksum](https://qgis.org/downloads/QGIS-OSGeo4W-3.34.3-1.sha256sum)| -|Long Term Release|3.28.15 Firenze LTR|[Installer](https://qgis.org/downloads/QGIS-OSGeo4W-3.28.15-1.msi) [Checksum](https://qgis.org/downloads/QGIS-OSGeo4W-3.28.15-1.sha256sum)| -|Development|3.35 master|[Weekly snapshots](https://download.osgeo.org/qgis/windows/weekly/?C=M&O=D)| +|Latest Release|{{< param "release" >}} {{< param "codename" >}} {{< param "releasenote" >}}|[Installer]({{< param "lr_msi" >}}) [Checksum]({{< param "lr_sha" >}})| +|Long Term Release|{{< param "ltrrelease" >}} {{< param "ltrcodename" >}} {{< param "ltrnote" >}}|[Installer]({{< param "ltr_msi">}}) [Checksum]({{< param "ltr_sha">}})| +|Development|{{< param "devversion" >}} master|[Weekly snapshots]({{< param "weekly_msi">}})| See also [The main installers page](../../download). @@ -55,11 +55,11 @@ Alternatively to _Express_ you also use the _Advanced Install_, navigate to the |Release|Version|Package|Description| |---|---|---|---| -|Latest Release|3.34.3 Prizren ​|qgis|Release| -|qgis-rel-dev [[1]](#id5)|Nightly build of the upcoming point release| -|Long Term Release|3.28.15 Firenze LTR|qgis-ltr|Release| -|qgis-ltr-dev [[1]](#id5)|Nightly build of the upcoming long term point release| -|Development|3.35 master|qgis-dev [[1]](#id5)|Nightly build of the development version| +|Latest Release|{{< param "release" >}} {{< param "codename" >}} {{< param "releasenote" >}}|qgis|Release| +|||qgis-rel-dev [[1]](#id5)|Nightly build of the upcoming point release| +|Long Term Release|{{< param "ltrrelease" >}} {{< param "ltrcodename" >}} {{< param "ltrnote" >}}|qgis-ltr|Release| +|||qgis-ltr-dev [[1]](#id5)|Nightly build of the upcoming long term point release| +|Development|{{< param "devversion" >}} master|qgis-dev [[1]](#id5)|Nightly build of the development version| [1] ([1](#id2),[2](#id3),[3](#id4)) @@ -88,7 +88,7 @@ In the section following this one, you will find ALL possible options to install {{< rich-content-end >}} {{< rich-box-end >}} -Here you will simply install the latest stable QGIS (3.34.x Prizren) in your Debian or Ubuntu without having to edit config files. +Here you will simply install the latest stable QGIS ({{< param "version" >}}.x {{< param "codename" >}}) in your Debian or Ubuntu without having to edit config files. {{< rich-box-start icon="🌀" layoutClass="tips">}} {{< rich-content-start themeClass="coloring-1" >}} @@ -110,7 +110,7 @@ sudo mkdir -m755 -p /etc/apt/keyrings # not needed since apt version 2.4.0 like sudo wget -O /etc/apt/keyrings/qgis-archive-keyring.gpg https://download.qgis.org/downloads/qgis-archive-keyring.gpg ``` -Add the QGIS repo for the latest stable QGIS (3.34.x Prizren) to `/etc/apt/sources.list.d/qgis.sources`: +Add the QGIS repo for the latest stable QGIS ({{< param "version" >}}.x {{< param "codename" >}}) to `/etc/apt/sources.list.d/qgis.sources`: ``` Types: deb deb-src @@ -168,7 +168,7 @@ The release packages are only produced once shortly after a new version has been - move to a stable debian version and use the released packages for it, -- wait for the next point release (due 2024-02-23 12:00:00 UTC), which happens every month and will include the updated dependencies, +- wait for the next point release (due {{< param "nextpointreleasedate" >}}), which happens every month and will include the updated dependencies, - switch to a nightly repository (available for the **two** release branches and master) whose packages are rebuild on regular basis and will also pickup the updated dependencies automatically or @@ -181,23 +181,23 @@ Lines of packages: | Release | Version | Description | Repository | | ---- | ---- | ---- | ---- | -| Latest Release | 3.34.x Prizren ​ | Release for **Debian and Ubuntu** | [https://qgis.org/debian](https://qgis.org/debian) [https://qgis.org/ubuntu](https://qgis.org/ubuntu) | -| Release with ubuntugis-unstable dependencies | [https://qgis.org/ubuntugis](https://qgis.org/ubuntugis) | | | -| Nightly build of upcoming point release for Debian and Ubuntu [[5]](#id12) | [https://qgis.org/debian-nightly-release](https://qgis.org/debian-nightly-release) [https://qgis.org/ubuntu-nightly-release](https://qgis.org/ubuntu-nightly-release) | | | -| Nightly build of upcoming point release with ubuntugis-unstable dependencies [[5]](#id12) | [https://qgis.org/ubuntugis-nightly-release](https://qgis.org/ubuntugis-nightly-release) | | | -| Long Term Release Repository | 3.28.x Firenze LTR | Release for **Debian and Ubuntu** | [https://qgis.org/debian-ltr](https://qgis.org/debian-ltr) [https://qgis.org/ubuntu-ltr](https://qgis.org/ubuntu-ltr) | -| Release with ubuntugis-unstable dependencies | [https://qgis.org/ubuntugis-ltr](https://qgis.org/ubuntugis-ltr) | | | -| Nightly build of upcoming point release for Debian and Ubuntu [[5]](#id12) | [https://qgis.org/debian-nightly-ltr](https://qgis.org/debian-nightly-ltr) [https://qgis.org/ubuntu-nightly-ltr](https://qgis.org/ubuntu-nightly-ltr) | | | -| Nightly build of upcoming point release with ubuntugis-unstable dependencies [[5]](#id12) | [https://qgis.org/ubuntugis-nightly-ltr](https://qgis.org/ubuntugis-nightly-ltr) | | | -| Development Version | 3.35 master | Nightly build for **Debian and Ubuntu** [[5]](#id12) | [https://qgis.org/debian-nightly](https://qgis.org/debian-nightly) [https://qgis.org/ubuntu-nightly](https://qgis.org/ubuntu-nightly) | -| Nightly build with ubuntugis-unstable dependencies [[5]](#id12) | [https://qgis.org/ubuntugis-nightly](https://qgis.org/ubuntugis-nightly) | | | +| Latest Release | {{< param "version" >}}.x {{< param "codename" >}} {{< param "releasenote">}} | Release for **Debian and Ubuntu** | https://qgis.org/debian
https://qgis.org/ubuntu | +||| Release with ubuntugis-unstable dependencies | https://qgis.org/ubuntugis | | | +||| Nightly build of upcoming point release for Debian and Ubuntu [[5]](#id12) | https://qgis.org/debian-nightly-release
https://qgis.org/ubuntu-nightly-release | | | +||| Nightly build of upcoming point release with ubuntugis-unstable dependencies [[5]](#id12) | https://qgis.org/ubuntugis-nightly-release | | | +| Long Term Release Repository | {{< param "ltrversion" >}}.x {{< param "ltrcodename" >}} {{< param "ltrnote" >}} | Release for **Debian and Ubuntu** | https://qgis.org/debian-ltr https://qgis.org/ubuntu-ltr | +||| Release with ubuntugis-unstable dependencies | https://qgis.org/ubuntugis-ltr | | | +||| Nightly build of upcoming point release for Debian and Ubuntu [[5]](#id12) | https://qgis.org/debian-nightly-ltr
https://qgis.org/ubuntu-nightly-ltr | | | +||| Nightly build of upcoming point release with ubuntugis-unstable dependencies [[5]](#id12) | https://qgis.org/ubuntugis-nightly-ltr | | | +| Development Version | {{< param "devversion" >}} master | Nightly build for **Debian and Ubuntu** [[5]](#id12) | https://qgis.org/debian-nightly
https://qgis.org/ubuntu-nightly | +||| Nightly build with ubuntugis-unstable dependencies [[5]](#id12) | https://qgis.org/ubuntugis-nightly | | | [5] ([1](#id6),[2](#id7),[3](#id8),[4](#id9),[5](#id10),[6](#id11)) nightlies are debug builds (including debug output) -Next point release: 2024-02-23 12:00:00 UTC +Next point release: {{< param "nextpointreleasedate" >}} -Next release: 2024-02-23 12:00:00 UTC +Next release: {{< param "nextreleasedate" >}} (more dates see Release Schedule on [Road Map](../roadmap)) @@ -207,12 +207,12 @@ Next release: 2024-02-23 12:00:00 UTC |Distribution|Version|Codename|Also available based on ubuntugis-unstable dependencies?| |---|---|---|---| |Debian|12.x (stable)|bookworm|| -|11.x (oldstable)|bullseye|| -|unstable|sid|| +||11.x (oldstable)|bullseye|| +||unstable|sid|| |Ubuntu|24.04 (LTS) [[6]](#id14)|noble|| -|23.10|mantic|| -|23.04|lunar|| -|22.04 (LTS)|jammy|yes| +||23.10|mantic|| +||23.04|lunar|| +||22.04 (LTS)|jammy|yes| [[6](#id13)] @@ -331,7 +331,7 @@ sudo dnf install qgis-server python3-qgis |Fedora|36|3.28|8.0| |37|3.28|8.2| -More information are available at [https://copr.fedorainfracloud.org/coprs/dani/qgis/](https://copr.fedorainfracloud.org/coprs/dani/qgis/) +More information are available at https://copr.fedorainfracloud.org/coprs/dani/qgis/ ### QGIS LTR (Long Term Release) @@ -358,7 +358,7 @@ sudo dnf install qgis-server python3-qgis |Fedora|36|3.22|8.0| |37|3.22|8.2| -More information are available at [https://copr.fedorainfracloud.org/coprs/dani/qgis-ltr/](https://copr.fedorainfracloud.org/coprs/dani/qgis-ltr/) +More information are available at https://copr.fedorainfracloud.org/coprs/dani/qgis-ltr/ ## SUSE / openSUSE @@ -366,17 +366,17 @@ Latest stable and LTR packages called qgis and qgis-ltr are available in the fol |Distribution|Repository| |---|---| -|Tumbleweed|[https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Tumbleweed/](https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Tumbleweed/)| -|Leap 15.2|[https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Leap_15.2/](https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Leap_15.2/)| -|Leap 15.1|[https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Leap_15.1/](https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Leap_15.1/)| -|Factory ARM|[https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Factory_ARM/](https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Factory_ARM/)| -|Factory PowerPC|[https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Factory_PowerPC/](https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Factory_PowerPC/)| -|SLE 15 SP1 Backports|[https://download.opensuse.org/repositories/Application:/Geo/SLE_15_SP1_Backports/](https://download.opensuse.org/repositories/Application:/Geo/SLE_15_SP1_Backports/)| -|SLE 15 SP1 Backports debug|[https://download.opensuse.org/repositories/Application:/Geo/SLE_15_SP1_Backports_debug/](https://download.opensuse.org/repositories/Application:/Geo/SLE_15_SP1_Backports_debug/)| +|Tumbleweed|https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Tumbleweed/| +|Leap 15.2|https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Leap_15.2/| +|Leap 15.1|https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Leap_15.1/| +|Factory ARM|https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Factory_ARM/| +|Factory PowerPC|https://download.opensuse.org/repositories/Application:/Geo/openSUSE_Factory_PowerPC/| +|SLE 15 SP1 Backports|https://download.opensuse.org/repositories/Application:/Geo/SLE_15_SP1_Backports/| +|SLE 15 SP1 Backports debug|https://download.opensuse.org/repositories/Application:/Geo/SLE_15_SP1_Backports_debug/| All packages include GRASS and Python support. -All openSUSE Geo repositories can be found here: [https://download.opensuse.org/repositories/Application:/Geo/](https://download.opensuse.org/repositories/Application:/Geo/) +All openSUSE Geo repositories can be found here: https://download.opensuse.org/repositories/Application:/Geo/ ## Mandriva @@ -392,13 +392,13 @@ urpmi qgis-python qgis-grass ### QGIS stable -Packages on [https://slackbuilds.org/result/?search=qgis](https://slackbuilds.org/result/?search=qgis) +Packages on https://slackbuilds.org/result/?search=qgis ## Arch Linux ### QGIS stable -Arch Linux is available in official repository : [https://archlinux.org/packages/extra/x86_64/qgis/](https://archlinux.org/packages/extra/x86_64/qgis/) +Arch Linux is available in official repository : https://archlinux.org/packages/extra/x86_64/qgis/ Install with: @@ -416,7 +416,7 @@ Install with yaourt or other package manager which support AUR: yaourt -S qgis-ltr ``` -For bugs and other behaviour, read comments here : [https://aur.archlinux.org/packages/qgis-ltr/](https://aur.archlinux.org/packages/qgis-ltr/) +For bugs and other behaviour, read comments here : https://aur.archlinux.org/packages/qgis-ltr/ ### QGIS testing @@ -426,15 +426,15 @@ Install with yaourt or other package manager which support AUR: yaourt -S qgis-git -For bugs and other behaviour, read comments here : [https://aur.archlinux.org/packages/qgis-git](https://aur.archlinux.org/packages/qgis-git) +For bugs and other behaviour, read comments here : https://aur.archlinux.org/packages/qgis-git ## Flatpak There is an QGIS flatpak for QGIS Stable available, maintained by the flathub community. -For general Linux Flatpak install notes, see [https://flatpak.org/setup/](https://flatpak.org/setup/) +For general Linux Flatpak install notes, see https://flatpak.org/setup/ -QGIS on Flathub: [https://flathub.org/apps/details/org.qgis.qgis](https://flathub.org/apps/details/org.qgis.qgis) +QGIS on Flathub: https://flathub.org/apps/details/org.qgis.qgis To install: @@ -456,7 +456,7 @@ flatpak update On certain distributions, you may also need to install xdg-desktop-portal or xdg-desktop-portal-gtk packages in order for file dialogs to appear. -Flathub files: [https://github.com/flathub/org.qgis.qgis](https://github.com/flathub/org.qgis.qgis) and report issues here: [https://github.com/flathub/org.qgis.qgis/issues](https://github.com/flathub/org.qgis.qgis/issues) +Flathub files: https://github.com/flathub/org.qgis.qgis and report issues here: https://github.com/flathub/org.qgis.qgis/issues Note: if you need to install additional Python modules, because they are needed by a plugin, you can install the module with (here installing the scipy module): @@ -466,9 +466,9 @@ flatpak run --devel --command=pip3 org.qgis.qgis install scipy --user Spack is a distro agnostic package manager for Linux, which is developed in the context of high-performance computing. -General info on installing Spack: [https://github.com/spack/spack](https://github.com/spack/spack) +General info on installing Spack: https://github.com/spack/spack -QGIS package file on Spack: [https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/qgis/package.py](https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/qgis/package.py) +QGIS package file on Spack: https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/qgis/package.py To install: @@ -491,7 +491,7 @@ spack add qgis py-lz4 spack install ``` -Spack related issues should be reported at: [https://github.com/spack/spack/issues](https://github.com/spack/spack/issues) +Spack related issues should be reported at: https://github.com/spack/spack/issues # Mac OS X / macOS @@ -536,9 +536,9 @@ Concurrent installation of Homebrew and MacPorts is not compatible and will almo ## Old releases -Previous releases of the official installer can be downloaded from [https://qgis.org/downloads/macos/](https://qgis.org/downloads/macos/). +Previous releases of the official installer can be downloaded from https://qgis.org/downloads/macos/. -Previous releases of the kyngchaos installer can be downloaded from [https://www.kyngchaos.com/software/archive/qgis/](https://www.kyngchaos.com/software/archive/qgis/). The oldest installers support macOS 10.4 Tiger. +Previous releases of the kyngchaos installer can be downloaded from https://www.kyngchaos.com/software/archive/qgis/. The oldest installers support macOS 10.4 Tiger. # FreeBSD @@ -582,13 +582,13 @@ To install QGIS from third-party package pkg_add qgis ``` -See: - [https://openbsd.app/?search=qgis](https://openbsd.app/?search=qgis) # for -stable OpenBSD - [https://openbsd.app/?search=qgis¤t=on](https://openbsd.app/?search=qgis¤t=on) # for -current OpenBSD +See: - https://openbsd.app/?search=qgis # for -stable OpenBSD - https://openbsd.app/?search=qgis¤t=on # for -current OpenBSD # Android An old and deprecated not touch optimised release of QGIS for Android can be found on the google play store. -[https://play.google.com/store/apps/details?id=org.qgis.qgis](https://play.google.com/store/apps/details?id=org.qgis.qgis) +https://play.google.com/store/apps/details?id=org.qgis.qgis {{< rich-box-start icon="⚠️" layoutClass="tips">}} {{< rich-content-start themeClass="coloring-6" >}} diff --git a/content/resources/roadmap.md b/content/resources/roadmap.md index d037db6ad..b39613f93 100644 --- a/content/resources/roadmap.md +++ b/content/resources/roadmap.md @@ -70,7 +70,7 @@ This schedule is also available as [“iCalendar”](https://qgis.org/schedule.i "FF","Feature freeze, end of development phase" "PR","Point release of latest release and LTR branch" "EPR","Extra Point release" -":rm-current:current",":rm-current:currently supported releases: |ltrrelease| and |release|" +":rm-current:current",":rm-current:currently supported releases: {{< param "ltrrelease" >}} and {{< param "release" >}}" ":rm-next:next",":rm-next:next releases" {{< /csv-table >}} diff --git a/content/resources/support/bug-reporting.md b/content/resources/support/bug-reporting.md index 9206ce520..274349b18 100644 --- a/content/resources/support/bug-reporting.md +++ b/content/resources/support/bug-reporting.md @@ -33,7 +33,7 @@ QGIS applications (QGIS Desktop and QGIS Server) issues are available in [Github ### Before reporting an issue -Before filing an issue, verify that you are running the currently supported versions 3.28.15 or 3.34.3 or the development version 3.35 (see also [Release schedule]({{< ref "resources/roadmap#release-schedule" >}})) and review the currently open issues to make sure that you aren’t creating a duplicate. If you have additional information on an issue, you can add it to the existing ticket. Third party plugins might also cause problems. If you have installed any, you should also verify that the problem is still reproducible without them. Please don’t report multiple unrelated bugs in a single bug report. +Before filing an issue, verify that you are running the currently supported versions {{< param "ltrrelease" >}} or {{< param "release" >}} or the development version {{< param "devversion" >}} (see also [Release schedule]({{< ref "resources/roadmap#release-schedule" >}})) and review the currently open issues to make sure that you aren’t creating a duplicate. If you have additional information on an issue, you can add it to the existing ticket. Third party plugins might also cause problems. If you have installed any, you should also verify that the problem is still reproducible without them. Please don’t report multiple unrelated bugs in a single bug report. When you’re are logged in, a `New Issue` button is available. Select it and follow the instructions there. diff --git a/content/resources/support/faq.md b/content/resources/support/faq.md index dc5277e87..5ce806fbe 100644 --- a/content/resources/support/faq.md +++ b/content/resources/support/faq.md @@ -78,40 +78,40 @@ To cite QGIS in your piece of work, or for an assignment, please use citation ty **Cite the QGIS project in general** -QGIS.org, |yeartag|. QGIS Geographic Information System. QGIS Association. http://www.qgis.org +QGIS.org, {{< param "yeartag" >}}. QGIS Geographic Information System. QGIS Association. http://www.qgis.org **Cite the QGIS Developers Manual** -QGIS.org, |yeartag|. QGIS |ltrversion|. Geographic Information System Developers Manual. QGIS Association. -Electronic document: |devcite| +QGIS.org, {{< param "yeartag" >}}. QGIS {{< param "ltrversion" >}}. Geographic Information System Developers Manual. QGIS Association. +Electronic document: {{< param-link "devcite" >}} **Cite the QGIS Installation Guide** -QGIS.org, |yeartag|. QGIS |ltrversion|. Geographic Information System Installation Guide. QGIS Association. +QGIS.org, {{< param "yeartag" >}}. QGIS {{< param "ltrversion" >}}. Geographic Information System Installation Guide. QGIS Association. Electronic document: https://github.com/qgis/QGIS/blob/master/INSTALL.md **Cite the QGIS User Guide** -QGIS.org, |yeartag|. QGIS |ltrversion|. Geographic Information System User Guide. QGIS Association. -Electronic document: |userguidecite| +QGIS.org, {{< param "yeartag" >}}. QGIS {{< param "ltrversion" >}}. Geographic Information System User Guide. QGIS Association. +Electronic document: {{< param-link "userguidecite" >}} **Cite the QGIS Server Documentation** -QGIS.org, |yeartag|. QGIS |ltrversion|. Geographic Information System API Documentation. QGIS Association. -Electronic document: |servercite| +QGIS.org, {{< param "yeartag" >}}. QGIS {{< param "ltrversion" >}}. Geographic Information System API Documentation. QGIS Association. +Electronic document: {{< param-link "servercite" >}} **Cite the QGIS API Documentation** -QGIS.org, |yeartag|. QGIS |ltrversion|. Geographic Information System API Documentation. QGIS Association. -Electronic document: |apicite| +QGIS.org, {{< param "yeartag" >}}. QGIS {{< param "ltrversion" >}}. Geographic Information System API Documentation. QGIS Association. +Electronic document: {{< param-link "apicite" >}} @@ -127,7 +127,7 @@ Example BibTeX entry: title = {QGIS Geographic Information System}, author = {{QGIS Development Team}}, organization = {QGIS Association}, - year = {|yeartag|}, + year = {{{< param "yeartag" >}}}, url = {https://www.qgis.org}, } ``` diff --git a/csv/schedule.csv b/csv/schedule.csv index c16810564..1f32dc97a 100644 --- a/csv/schedule.csv +++ b/csv/schedule.csv @@ -15,9 +15,9 @@ "LTR/PR",":rm-past:3.34.0",":rm-past:3.28.12","","2023-10-27","44","4" "PR",":rm-past:3.34.1",":rm-past:3.28.13","","2023-11-24","48","4" "PR",":rm-past:3.34.2",":rm-past:3.28.14","","2023-12-22","52","4" -":rm-current:PR/FF",":rm-current:3.34.3",":rm-current:3.28.15","3.35","2024-01-19","3","5" -"LR/PR",":rm-next:3.36.0",":rm-next:3.34.4","","2024-02-23","8","4" -"PR",":rm-future:3.36.1",":rm-future:3.34.5","","2024-03-22","12","4" +"PR/FF",":rm-past:3.34.3",":rm-past:3.28.15","3.35","2024-01-19","3","5" +":rm-current:LR/PR",":rm-current:3.36.0",":rm-current:3.34.4","","2024-02-23","8","4" +"PR",":rm-next:3.36.1",":rm-next:3.34.5","","2024-03-22","12","4" "PR",":rm-future:3.36.2",":rm-future:3.34.6","","2024-04-19","16","4" "PR/FF",":rm-future:3.36.3",":rm-future:3.34.7","3.37","2024-05-17","20","5" "LR/PR",":rm-future:3.38.0",":rm-future:3.34.8","","2024-06-21","25","4" diff --git a/data/conf.json b/data/conf.json new file mode 100644 index 000000000..6af88ed8d --- /dev/null +++ b/data/conf.json @@ -0,0 +1,30 @@ +{ + "version": "3.36", + "release": "3.36.0", + "releasedate": "2024, 2, 23", + "binary": "1", + "codename": "Maidenhead", + "releasenote": "RC", + "ltrversion": "3.34", + "ltrrelease": "3.34.4", + "ltrcodename": "Prizren", + "ltrbinary": "1", + "ltrnote": "LTR", + "shortver": "336", + "devversion": "3.37", + "nextversion": "3.38", + "nextfreezedate": "2024-05-17 12:00:00 UTC", + "nextreleasedate": "2024-06-21 12:00:00 UTC", + "nextpointreleasedate": "2024-03-22 12:00:00 UTC", + "infeaturefreeze": true, + "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": "https://qgis.org/pyqgis/3.34/index.html", + "lr_msi": "https://qgis.org/downloads/QGIS-OSGeo4W-3.36.0-1.msi", + "lr_sha": "https://qgis.org/downloads/QGIS-OSGeo4W-3.36.0-1.sha256sum", + "ltr_msi": "https://qgis.org/downloads/QGIS-OSGeo4W-3.34.4-1.msi", + "ltr_sha": "https://qgis.org/downloads/QGIS-OSGeo4W-3.34.4-1.sha256sum", + "weekly_msi": "https://download.osgeo.org/qgis/windows/weekly/?C=M&O=D" +} diff --git a/scripts/schedule.py b/scripts/schedule.py deleted file mode 100644 index 5cd48da91..000000000 --- a/scripts/schedule.py +++ /dev/null @@ -1,25 +0,0 @@ -from datetime import date - -# latest release -version = '3.34' -release = '3.34.3' -codename = u'Prizren' -binary = '1' -releasedate = date(2024, 1, 19) -releasenote = u'\u200B' -shortver = u'334' - -# long term release repository -ltrversion = '3.28' -ltrrelease = '3.28.15' -ltrcodename = u'Firenze' -ltrbinary = '1' -ltrnote = u'LTR' - -devversion = '3.35' -nextversion = '3.36' -nextfreezedate = '2024-01-19 12:00:00 UTC' -nextreleasedate = '2024-02-23 12:00:00 UTC' -nextpointreleasedate = '2024-02-23 12:00:00 UTC' - -infeaturefreeze = True diff --git a/scripts/update-schedule.py b/scripts/update-schedule.py index 0d6d96a6a..51dbdfa56 100644 --- a/scripts/update-schedule.py +++ b/scripts/update-schedule.py @@ -3,6 +3,7 @@ from urllib.request import urlopen import csv +import json import os import re import codecs @@ -207,63 +208,48 @@ def adduid(ev, uid): assert lr_version.split(".") > ltr_version.split("."), f"LR {lr_version} not higher than {ltr_version}" assert devversion.split(".") > lr_version.split("."), f"DEV {devversion} not higher than {lr_version}" -o = open("scripts/schedule.py", "w") - shortver = "".join(lr_version.split(".")[:2]) for f in [ # f"themes/qgis-theme/static/images/qgisorg_banner{shortver}.png", # TODO - f"content/product/visual-changelogs/visualchangelog{shortver}/index.md" + # f"content/product/visual-changelogs/visualchangelog{shortver}/index.md" ]: assert os.path.exists(f), f"{f} not found" -o.write("""\ -from datetime import date - -# latest release -version = '%(version)s' -release = '%(release)s' -codename = u'%(lr_name)s' -binary = '%(lr_binary)s' -releasedate = date(%(releasedate)s) -releasenote = u'%(lr_note)s' -shortver = u'%(shortver)s' - -# long term release repository -ltrversion = '%(ltrversion)s' -ltrrelease = '%(ltrrelease)s' -ltrcodename = u'%(ltr_name)s' -ltrbinary = '%(ltr_binary)s' -ltrnote = u'%(ltr_note)s' - -devversion = '%(devversion)s' -nextversion = '%(nextversion)s' -nextfreezedate = '%(nextfreezedate)s' -nextreleasedate = '%(nextreleasedate)s' -nextpointreleasedate = '%(nextpointreleasedate)s' - -infeaturefreeze = %(infeaturefreeze)s -""" % { - "version": ".".join(lr_version.split(".")[:2]), - "release": lr_version, - "releasedate": "{0}, {1}, {2}".format(lr_date.year, lr_date.month, lr_date.day), - "lr_binary": lr_binary, - "lr_name": lr_name.replace("'", "\\'"), - "lr_note": lr_note.replace("'", "\\'") if lr_note != '' else ('RC' if lr_version.split('.')[2] == '0' else '\\u200B'), - "ltrversion": ".".join(ltr_version.split(".")[:2]), - "ltrrelease": ltr_version, - "ltr_name": ltr_name.replace("'", "\\'"), - "ltr_binary": ltr_binary, - "ltr_note": ltr_note.replace("'", "\\'") if ltr_note != '' else 'LTR', - "shortver": shortver, - "devversion": devversion, - "nextversion": nextversion, - "nextfreezedate": f_date.strftime('%Y-%m-%d %H:%M:%S UTC') if f_date is not None else None, - "nextreleasedate": nr_date.strftime('%Y-%m-%d %H:%M:%S UTC') if nr_date is not None else None, - "nextpointreleasedate": pr_date.strftime('%Y-%m-%d %H:%M:%S UTC'), - "infeaturefreeze": "True" if f_date < now else "False" -}) - -o.close() +ltrversion = ".".join(ltr_version.split(".")[:2]) + +with open("data/conf.json", "w") as f: + json.dump({ + "version": ".".join(lr_version.split(".")[:2]), + "release": lr_version, + "releasedate": lr_date.strftime("%d.%m.%Y"), + "binary": lr_binary, + "codename": lr_name.replace("'", "\\'"), + "releasenote": lr_note.replace("'", "\\'") if lr_note != '' else ('RC' if lr_version.split('.')[2] == '0' else '\\u200B'), + "ltrversion": ltrversion, + "ltrrelease": ltr_version, + "ltrcodename": ltr_name.replace("'", "\\'"), + "ltrbinary": ltr_binary, + "ltrnote": ltr_note.replace("'", "\\'") if ltr_note != '' else 'LTR', + "shortver": shortver, + "devversion": devversion, + "nextversion": nextversion, + "nextfreezedate": f_date.strftime('%Y-%m-%d %H:%M:%S UTC') if f_date is not None else None, + "nextreleasedate": nr_date.strftime('%Y-%m-%d %H:%M:%S UTC') if nr_date is not None else None, + "nextpointreleasedate": pr_date.strftime('%Y-%m-%d %H:%M:%S UTC'), + "infeaturefreeze": f_date < now, + + # additional params: + "yeartag": "%%Y", + "devcite": f"https://docs.qgis.org/{ltrversion}/en/docs/developers_guide/index.html", + "userguidecite": f"https://docs.qgis.org/{ltrversion}/en/docs/user_manual/index.html", + "servercite": f"https://docs.qgis.org/{ltrversion}/en/docs/server_manual/index.html", + "apicite": f"https://qgis.org/pyqgis/{ltrversion}/index.html", + "lr_msi": f"https://qgis.org/downloads/QGIS-OSGeo4W-{lr_version}-{lr_binary}.msi", + "lr_sha": f"https://qgis.org/downloads/QGIS-OSGeo4W-{lr_version}-{lr_binary}.sha256sum", + "ltr_msi": f"https://qgis.org/downloads/QGIS-OSGeo4W-{ltr_version}-{ltr_binary}.msi", + "ltr_sha": f"https://qgis.org/downloads/QGIS-OSGeo4W-{ltr_version}-{ltr_binary}.sha256sum", + "weekly_msi": "https://download.osgeo.org/qgis/windows/weekly/?C=M&O=D", + }, f, indent=4) o = open("scripts/schedule.ics", "wb") o.write(cal.to_ical()) diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-macos.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-macos.html new file mode 100644 index 000000000..53f9bf1fb --- /dev/null +++ b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-macos.html @@ -0,0 +1,11 @@ +{{ with index .Site.Data.conf }} +Long Term Version for Mac OS ({{ .ltrversion }} {{ .ltrnote }}) + +Latest Version for Mac OS ({{ .version }}) +{{ end }} diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-platforms.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-platforms-end.html similarity index 88% rename from themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-platforms.html rename to themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-platforms-end.html index b9f67fc37..33f7b8478 100644 --- a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-platforms.html +++ b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/download-platforms-end.html @@ -1,10 +1,3 @@ -