Skip to content

Commit

Permalink
Update doe release notes; documentation updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@msinn
msinn committed Jan 2, 2025
1 parent df2d65e commit 800c97e
Show file tree
Hide file tree
Showing 3 changed files with 230 additions and 25 deletions.
4 changes: 2 additions & 2 deletions doc/user/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
# General information about the project.
#project = u'SmartHomeNG'
project = u'Dokumentation '
copyright = u'2016-2024 SmartHomeNG Team - SmartHomeNG is based on smarthome.py © Marcus Popp'
copyright = u'2016-2025 SmartHomeNG Team - SmartHomeNG is based on smarthome.py © Marcus Popp'

# The full version, including alpha/beta/rc tags.
#release = '1.3a dev (as of 13. October 2017)' 13. October 2017 is replaced by makefile with a date in the form of '2. September 2017'
Expand Down Expand Up @@ -118,7 +118,7 @@
plgrelease = shngversion.get_shng_plugins_version()
plgbranch = pluginsversion.plugin_branch()
if plgbranch != 'master':
copyright = u'2016-2024 SmartHomeNG Team - ACHTUNG: Dokumentation zum Develop Branch - Work in Progress'
copyright = u'2016-2025 SmartHomeNG Team - ACHTUNG: Dokumentation zum Develop Branch - Work in Progress'
plgrelease += ' ' + plgbranch
version = plgrelease

Expand Down
33 changes: 16 additions & 17 deletions doc/user/source/installation/anforderungen.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,13 @@ Version aktuelle Python Version und die zwei Vorgängerversionen.**
.. csv-table:: Zur Verdeutlichung
:header: "SmartHomeNG", "akt. Python zu Entwicklungsstart", "unterstützte Python Versionen", "minimale Python Version"

"v1.4", "Python 3.6", "Python 3.4, 3.5, 3.6", "Python 3.3"
"v1.5", "Python 3.6", "Python 3.4, 3.5, 3.6", "Python 3.4"
"v1.6", "Python 3.7", "Python 3.5, 3.6, 3.7", "Python 3.4"
"v1.7", "Python 3.7", "Python 3.5, 3.6, 3.7", "Python 3.5"
"v1.8", "Python 3.8", "Python 3.6, 3.7, 3.8", "Python 3.6"
"v1.9", "Python 3.9", "Python 3.7, 3.8, 3.9", "Python 3.7"
"v1.10", "Python 3.10", "Python 3.8, 3.9, 3.10", "Python 3.8"
"v1.11", "Python 3.12", "Python 3.10, 3.11, 3.12", "tbd"
"v1.11", "Python 3.12", "Python 3.10, 3.11, 3.12", "Python 3.8"
"v1.12", "Python 3.13", "Python 3.11, 3.12, 3.13", "tbd"

Wenn die eingesetzte Python Version nicht in den unterstützen Python Versionen aufgelistet ist, bedeutet das nicht
automatisch, dass SmartHomeNG mit älteren/neueren Python Versionen nicht funktioniert. Die Entwicklung wird nur
Expand All @@ -222,15 +221,14 @@ ist in der folgenden Tabelle aufgelistet:
.. csv-table:: Aktive Python Releases (wie auf python.org dokumentiert)
:header: "Python Version", "Maintenance Status", "Erstes Release", "Support Ende"

"3.6", "end of life", "22\. Dezember 2016", "13\. Dezember 2021"
"3.7", "end of life", "27\. Juni 2018", "27\. Juni 2023"
"3.8", "security", "14\. Oktober 2019", "Oktober 2024"
"3.8", "end of life", "14\. Oktober 2019", "Oktober 2024"
"3.9", "security", "5\. Oktober 2020", "Oktober 2025"
"3.10", "security", "4\. Oktober 2021", "Oktober 2026"
"3.11", "security", "24\. Oktober 2022", "Oktober 2027"
"3.12", "bugfix", "2\. Oktober 2023", "Oktober 2028"
"3.13", "prerelease", "1\. Oktober 2024", "Oktober 2029"
"3.13", "feature", "1\. Oktober 2025", "Oktober 2030"
"3.13", "bugfix", "7\. Oktober 2024", "Oktober 2029"
"3.14", "development", "1\. Oktober 2025", "Oktober 2030"


Python (und PHP) Versionen unter Linux
Expand All @@ -244,19 +242,20 @@ Python Versionen zu installieren (Sies Abschnitt Referenz).
Hier sind einige Beispiele für Linux-System und mitgeliefere Software Versionen:

.. csv-table:: Distributionen und enthaltene Python und PHP Versionen
:header: "Distribution", "End of Support", "Python Version", "PHP Version"
:header: "Distribution", "Release Date", "End of Support", "Python Version", "PHP Version"

"Debian 10 (Buster)", "Sep 2022 / Jun 2024", "Python 3.7", "PHP 7.3"
"Debian 11 (Bullseye)", "Jul 2027", "Python 3.9", "PHP 7.4"
"Debian 12 (Bookworm)", "", "Python 3.11", "PHP 8.2"
"Ubuntu 18.04 LTS (Bionic Beaver)", "Apr 2023 / Apr 2028", "Python 3.6", "PHP 7.2"
"Ubuntu 20.04 LTS (Focal Fossa)", "Apr 2025 / Apr 2030", "Python 3.8", "PHP 7.4"
"**Ubuntu 22.04 LTS (Jammy Jellyfish)**", "Apr 2027 / Apr 2032", "Python 3.10", "PHP 8.1"
"Ubuntu 23.04 (Lunar Lobster)", "Jan 2024", "Python 3.11", "PHP 8.1"
"Ubuntu 22.10 (Mantic Minotaur)", "Jul 2024", "Python 3.11", "PHP 8.2"
"Debian 10 (Buster)", "06. Jul 2019", "Sep 2022 / Jun 2024", "Python 3.7", "PHP 7.3"
"Debian 11 (Bullseye)", "14. Aug 2021", "Aug 2026", "Python 3.9", "PHP 7.4"
"Debian 12 (Bookworm)", "10. Jun 2023", "Jun 2028", "Python 3.11", "PHP 8.2"

"Ubuntu 18.04 LTS (Bionic Beaver)", "Apr 201", "Apr 2023 / Apr 2028", "Python 3.6", "PHP 8.3, 8.2, 8.1, 8.0, 7.4"
"Ubuntu 20.04 LTS (Focal Fossa)", "Apr 2020", "Apr 2025 / Apr 2030", "Python 3.8", "PHP 8.4, 8.3, 8.2, 8.1, 8.0, 7.4"
"**Ubuntu 22.04 LTS (Jammy Jellyfish)**", "Apr 2022", "Apr 2027 / Apr 2032", "Python 3.10", "PHP 8.4, 8.3, 8.2, 8.1, 8.0, 7.4"
"**Ubuntu 24.04 LTS (Noble Numbat)**", "Apr 2024", "Jan 2029 / Apr 2034", "Python 3.12", "PHP 8.4, 8.3, 8.2, 8.1, 8.0, 7.4"
"Ubuntu 24.10 (Oracular Oriole)", "Oct 2024", "Jul 2025", "Python 3.12", "PHP 8.4, 8.3, 8.2, 8.1, 8.0, 7.4"

Aus den Beispielen ist ersichtlich, das Debian Stretch nicht mehr für Neuinstallationen verwendet werden sollte.

Aus den Beispielen ist ersichtlich, das Debian Buster nicht mehr für Neuinstallationen verwendet werden sollte.
Bei Ubuntu sollte man die LTS (Long Term Support) Varianten bevorzugen um nicht andauern mit Systemänderungen konfrontiert zu werden

PHP wird für SmartHomeNG selbst nicht benötigt, ist jedoch eine Voraussetzung für den Einsatz der
Expand Down
Loading

0 comments on commit 800c97e

Please sign in to comment.