From 5ea395dac1d08af076b2eafa9885a7cc11cb7db5 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Apr 03 2024 14:16:38 +0000 Subject: [PATCH 1/3] %{py3_shebang_flags} are added even if already there This was always that way, we just assumed it wasn't. Repeated flags are OK. Reported by @jrohel --- diff --git a/guidelines/modules/ROOT/pages/Python.adoc b/guidelines/modules/ROOT/pages/Python.adoc index 741d464..28ce5d8 100644 --- a/guidelines/modules/ROOT/pages/Python.adoc +++ b/guidelines/modules/ROOT/pages/Python.adoc @@ -1386,8 +1386,7 @@ If a directory is given, all `+.py+` files in it are fixed, recursively. (So, if you need to fix shebangs in files not named `+*.py+`, you need to list each file separately or use a Shell glob, such as `+%{buildroot}%{_libexecdir}/mytool/*+`.) -Existing flags are preserved and `+%{py3_shebang_flags}+` are added -(if not there already). +Existing flags are preserved and `+%{py3_shebang_flags}+` are added. + For example, `+#! /usr/bin/env python+` will be changed to `+#! /usr/bin/python3 -s+` From 646280d1d86ad686f1a175f9b0ad42bb22c14d9d Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Apr 03 2024 14:16:38 +0000 Subject: [PATCH 2/3] Update the location of the setuptools documentation wrt removing extras --- diff --git a/guidelines/modules/ROOT/pages/Python.adoc b/guidelines/modules/ROOT/pages/Python.adoc index 28ce5d8..6253210 100644 --- a/guidelines/modules/ROOT/pages/Python.adoc +++ b/guidelines/modules/ROOT/pages/Python.adoc @@ -845,7 +845,7 @@ from either the main package or another extras subpackage. Note that removing extras is discouraged in https://setuptools.readthedocs.io/en/latest/userguide/dependency_management.html#optional-dependencies[setuptools documentation] -(see the final paragraph of the linked section). +(see the _Tip_ box near the end of the _Optional dependencies_ section). ==== Automatic Requires for extras From 380c909c98915b533be3cfed0ca3cee69046fcf1 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Apr 03 2024 14:16:38 +0000 Subject: [PATCH 3/3] Bump the last-reviewed date in Python --- diff --git a/guidelines/modules/ROOT/pages/Python.adoc b/guidelines/modules/ROOT/pages/Python.adoc index 6253210..0bb8aed 100644 --- a/guidelines/modules/ROOT/pages/Python.adoc +++ b/guidelines/modules/ROOT/pages/Python.adoc @@ -1,5 +1,5 @@ = Python Packaging Guidelines -:last-reviewed: 2021-06-04 +:last-reviewed: 2024-04-03 ////