From 4161207f930b115e60f491968b79ca8e4225f19b Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Jul 08 2019 13:27:26 +0000 Subject: [PATCH 1/2] Python dep generator in RPM 4.15 adjusts version numbers Note that the Python automatic dependency generator in RPM 4.15 strips `.0` suffixes version numbers. Adjust the example accordingly. --- diff --git a/guidelines/modules/ROOT/pages/Python.adoc b/guidelines/modules/ROOT/pages/Python.adoc index 3bf1129..959b48e 100644 --- a/guidelines/modules/ROOT/pages/Python.adoc +++ b/guidelines/modules/ROOT/pages/Python.adoc @@ -91,8 +91,8 @@ And the resulting dependencies: python3.7dist(ipykernel) python3.7dist(ipython-genutils) python3.7dist(jinja2) -python3.7dist(jupyter-client) >= 5.2.0 -python3.7dist(jupyter-core) >= 4.4.0 +python3.7dist(jupyter-client) >= 5.2 +python3.7dist(jupyter-core) >= 4.4 python3.7dist(nbconvert) python3.7dist(nbformat) python3.7dist(prometheus-client) @@ -103,6 +103,9 @@ python3.7dist(tornado) >= 4 python3.7dist(traitlets) >= 4.2.1 .... +Note that since RPM 4.15, `+.0+` suffixes are removed from version numbers to match the behavior of Python tools. +(https://www.python.org/dev/peps/pep-0440/#final-releases[PEP 440] specifies that `+X.Y+` and `+X.Y.0+` are treated as equal.) + This generator is enabled by default in Fedora 30 and later. If a packager wishes to explicitly opt out of the generator because the upstream metadata are not applicable, a packager SHOULD opt out explicitly by adding: `+%{?python_disable_dependency_generator}+` From efecbdd0d946d3f1984b9aaea0649f0d33ec829d Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Jul 08 2019 14:40:27 +0000 Subject: [PATCH 2/2] Say behavior changed in Fedora 31, not RPM 4.15 This should make it easier to follow for most readers. --- diff --git a/guidelines/modules/ROOT/pages/Python.adoc b/guidelines/modules/ROOT/pages/Python.adoc index 959b48e..da7b44d 100644 --- a/guidelines/modules/ROOT/pages/Python.adoc +++ b/guidelines/modules/ROOT/pages/Python.adoc @@ -103,7 +103,7 @@ python3.7dist(tornado) >= 4 python3.7dist(traitlets) >= 4.2.1 .... -Note that since RPM 4.15, `+.0+` suffixes are removed from version numbers to match the behavior of Python tools. +Note that since Fedora 31, `+.0+` suffixes are removed from version numbers to match the behavior of Python tools. (https://www.python.org/dev/peps/pep-0440/#final-releases[PEP 440] specifies that `+X.Y+` and `+X.Y.0+` are treated as equal.) This generator is enabled by default in Fedora 30 and later. If a packager wishes to explicitly opt out of the generator because the upstream metadata are not applicable, a packager SHOULD opt out explicitly by adding: