Fix a regression with required legacy versions (e.g. pytz>dev)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2019954

python-rpm-generators.spec

@@ -1,7 +1,7 @@
 Name:           python-rpm-generators
 Summary:        Dependency generators for Python RPMs
 Version:        12
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 # Originally all those files were part of RPM, so license is kept here
 License:        GPLv2+
@@ -47,6 +47,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py
 %{_rpmconfigdir}/pythonbundles.py
 
 %changelog
+* Thu Nov 04 2021 Miro Hrončok <mhroncok@redhat.com> - 12-11
+- Fix a regression with required legacy versions (e.g. pytz>dev)
+- Fixes rhbz#2019954
+
 * Fri Oct 29 2021 Gordon Messmer <gordon.messmer@gmail.com> - 12-10
 - Additional fix for dev releases.
 

pythondistdeps.py

@@ -236,11 +236,15 @@ def convert_ordered(name, operator, version_id):
     else:
         version = RpmVersion(version_id)
     # Prevent dev and pre-releases from satisfying a < requirement
-    if operator == '<' and not version.pre and not version.dev and not version.post:
-        version = '{}~~'.format(version)
-    # Prevent post-releases from satisfying a > requirement
-    if operator == '>' and not version.pre and not version.dev and not version.post:
-        version = '{}.0'.format(version)
+    try:
+        # For backwards compatibility, fallback to previous behavior with LegacyVersions
+        if operator == '<' and not version.pre and not version.dev and not version.post:
+            version = '{}~~'.format(version)
+        # Prevent post-releases from satisfying a > requirement
+        if operator == '>' and not version.pre and not version.dev and not version.post:
+            version = '{}.0'.format(version)
+    except AttributeError:
+        pass
     return '{} {} {}'.format(name, operator, version)
 
 

tests/data/scripts_pythondistdeps/pyreq2rpm.tests-2020.04.07.024dab0-py3.9.egg-info/requires.txt

@@ -102,3 +102,5 @@ test___multiple__underscores==1
 test_underscores==1
 
 dnspython[DNSSEC]
+
+legacy>dev

tests/data/scripts_pythondistdeps/test-data.yaml

@@ -1312,6 +1312,7 @@
                 (python3.9dist(hugo3) < 11.1.1~b14 or python3.9dist(hugo3) > 11.1.1~b14)
                 python3.9dist(hugo4) > 11~rc0
                 python3.9dist(hugo5) = 11.1^post3
+                python3.9dist(legacy) > dev
                 python3.9dist(pyparsing0)
                 ((python3.9dist(pyparsing1) < 2.0.4 or python3.9dist(pyparsing1) > 2.0.4) with (python3.9dist(pyparsing1) < 2.1.2 or python3.9dist(pyparsing1) > 2.1.2) with (python3.9dist(pyparsing1) < 2.1.6 or python3.9dist(pyparsing1) > 2.1.6) with python3.9dist(pyparsing1) >= 2.0.1)
                 python3.9dist(test-multiple-underscores) = 1