From 3c8b35db92e96f4900fecca362e46633f6bc2ff1 Mon Sep 17 00:00:00 2001 From: Nico Kadel-Garcia Date: Fri, 16 Dec 2022 05:17:42 -0500 Subject: [PATCH 1/2] Set Defaults to use python3, along with support for RHEL 8 and RHEL 9 --- pyp2rpm/settings.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pyp2rpm/settings.py b/pyp2rpm/settings.py index 5e5f5f2a..8dbc6813 100644 --- a/pyp2rpm/settings.py +++ b/pyp2rpm/settings.py @@ -3,10 +3,12 @@ DEFAULT_TEMPLATE = 'fedora' DEFAULT_PYTHON_VERSIONS = { 'fedora': ['3'], - 'epel7': ['2', '3'], - 'epel6': ['2'], + 'epel9': ['3'], + 'epel8': ['3'], + 'epel7': ['3'], + 'epel6': ['3'], 'mageia': ['3'], - 'pld': ['2', '3'] + 'pld': ['3'] } DEFAULT_PYTHON_VERSION = DEFAULT_PYTHON_VERSIONS[DEFAULT_TEMPLATE][0] DEFAULT_PKG_SOURCE = 'pypi' From 56eaf934cec31170a6e0eb14c9d445d9d36a4295 Mon Sep 17 00:00:00 2001 From: Nico Kadel-Garcia Date: Fri, 16 Dec 2022 05:25:10 -0500 Subject: [PATCH 2/2] Discard epel 6 checks and python2 behavior --- pyp2rpm/convertor.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pyp2rpm/convertor.py b/pyp2rpm/convertor.py index 7a01ad76..589fd6be 100644 --- a/pyp2rpm/convertor.py +++ b/pyp2rpm/convertor.py @@ -81,25 +81,10 @@ def template_py_vers(self): def merge_versions(self, data): """Merges python versions specified in command lines options with - extracted versions, checks if some of the versions is not > 2 if EPEL6 - template will be used. attributes base_python_version and + extracted versions. Attributes base_python_version and python_versions contain values specified by command line options or default values, data.python_versions contains extracted data. """ - if self.distro == "epel6": - # if user requested version greater than 2, writes error message - # and exits - requested_versions = self.python_versions - if self.base_python_version: - requested_versions += [self.base_python_version] - if any(int(ver[0]) > 2 for ver in requested_versions): - sys.stderr.write( - "Invalid version, major number of python version for " - "EPEL6 spec file must not be greater than 2.\n") - sys.exit(1) - # if version greater than 2 were extracted it is removed - data.python_versions = [ - ver for ver in data.python_versions if not int(ver[0]) > 2] # Set python versions from default values in settings. base_version, additional_versions = (