From b1b14be397bf3d9fe95deb80eb7b8ece9895b0ca Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Tue, 30 Jan 2024 08:16:13 +0100 Subject: [PATCH 1/2] Switch scripts/ to python3 --- scripts/bloom-export-upstream | 2 +- scripts/bloom-generate | 2 +- scripts/bloom-release | 2 +- scripts/bloom-update | 2 +- scripts/git-bloom-branch | 2 +- scripts/git-bloom-config | 2 +- scripts/git-bloom-generate | 2 +- scripts/git-bloom-import-upstream | 2 +- scripts/git-bloom-patch | 2 +- scripts/git-bloom-release | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/bloom-export-upstream b/scripts/bloom-export-upstream index 0a7faef0..5ecd25cb 100755 --- a/scripts/bloom-export-upstream +++ b/scripts/bloom-export-upstream @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/bloom-generate b/scripts/bloom-generate index adc2bf7c..7aaee7f4 100755 --- a/scripts/bloom-generate +++ b/scripts/bloom-generate @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/bloom-release b/scripts/bloom-release index e35e5d8a..39cd2b3e 100755 --- a/scripts/bloom-release +++ b/scripts/bloom-release @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/bloom-update b/scripts/bloom-update index 6ecd6f5a..2dcdb587 100755 --- a/scripts/bloom-update +++ b/scripts/bloom-update @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/git-bloom-branch b/scripts/git-bloom-branch index 327f14f2..d5bfa6bf 100755 --- a/scripts/git-bloom-branch +++ b/scripts/git-bloom-branch @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/git-bloom-config b/scripts/git-bloom-config index d40b8b01..cbf7bd30 100755 --- a/scripts/git-bloom-config +++ b/scripts/git-bloom-config @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/git-bloom-generate b/scripts/git-bloom-generate index 9ca0aa94..8aaa9d09 100755 --- a/scripts/git-bloom-generate +++ b/scripts/git-bloom-generate @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/git-bloom-import-upstream b/scripts/git-bloom-import-upstream index 935f55f5..e8ef0afd 100755 --- a/scripts/git-bloom-import-upstream +++ b/scripts/git-bloom-import-upstream @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/git-bloom-patch b/scripts/git-bloom-patch index 894e1af8..1e0f6bf0 100755 --- a/scripts/git-bloom-patch +++ b/scripts/git-bloom-patch @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. diff --git a/scripts/git-bloom-release b/scripts/git-bloom-release index 5591d6ac..fc05e4d7 100755 --- a/scripts/git-bloom-release +++ b/scripts/git-bloom-release @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a place holder script for use in testing. From a0316c4a1fb0dae9d9150eefe51c116d26b00420 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Tue, 30 Jan 2024 08:23:03 +0100 Subject: [PATCH 2/2] Switch rpm to packaging.version --- bloom/generators/rpm/generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bloom/generators/rpm/generator.py b/bloom/generators/rpm/generator.py index 6b7194c4..5da42534 100644 --- a/bloom/generators/rpm/generator.py +++ b/bloom/generators/rpm/generator.py @@ -45,7 +45,7 @@ import textwrap from dateutil import tz -from distutils.version import LooseVersion +from packaging.version import Version from time import strptime from bloom.generators import BloomGenerator @@ -300,7 +300,7 @@ def generate_substitutions_from_package( # Changelog if releaser_history: sorted_releaser_history = sorted(releaser_history, - key=lambda k: LooseVersion(k), reverse=True) + key=lambda k: Version(k), reverse=True) sorted_releaser_history = sorted(sorted_releaser_history, key=lambda k: strptime(releaser_history.get(k)[0], '%a %b %d %Y'), reverse=True)