openstack/releases
Code Issues Proposed changes

Remove use of pkg_resources

Browse Source 
Change-Id: I8201f2a2939c2cdbfa989de0217c0561465df05b
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane
2025-10-31 17:02:50 +00:00
parent 7357e23381
commit 276704fdff
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openstack_releases/requirements.py
+2 -2
View File
@@ -17,7 +17,7 @@
import logging
import os.path
import pkg_resources
from packaging import requirements as pkg_requirements
from openstack_releases import gitutils
from openstack_releases import processutils
@@ -153,7 +153,7 @@ def parse_requirements(body):
continue
try:
parsed_req = pkg_resources.Requirement.parse(line)
parsed_req = pkg_requirements.Requirement(line)
except ValueError:
LOG.warning('failed to parse %r', line)
else:
openstack_releases/tests/test_requirements.py
+20 -20
View File
@@ -16,7 +16,7 @@ import textwrap
from unittest import mock
from oslotest import base
import pkg_resources
from packaging import requirements as pkg_requirements
from openstack_releases import requirements
@@ -60,19 +60,19 @@ class TestGetMinSpecifier(base.BaseTestCase):
def test_none(self):
actual = requirements.get_min_specifier(
pkg_resources.Requirement.parse('pbr').specifier,
pkg_requirements.Requirement('pbr').specifier,
)
self.assertIsNone(actual)
def test_greater(self):
actual = requirements.get_min_specifier(
pkg_resources.Requirement.parse('pbr>1.6').specifier,
pkg_requirements.Requirement('pbr>1.6').specifier,
)
self.assertEqual('1.6', actual.version)
def test_greater_equal(self):
actual = requirements.get_min_specifier(
pkg_resources.Requirement.parse('pbr>=1.6').specifier,
pkg_requirements.Requirement('pbr>=1.6').specifier,
)
self.assertEqual('1.6', actual.version)
@@ -84,7 +84,7 @@ class TestCompareLowerBounds(base.BaseTestCase):
old = {
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr'),
(None, 'pbr'): pkg_requirements.Requirement('pbr'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,
@@ -95,7 +95,7 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_dropped_requirement(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr'),
(None, 'pbr'): pkg_requirements.Requirement('pbr'),
}
new = {
}
@@ -108,10 +108,10 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_no_lower(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr'),
(None, 'pbr'): pkg_requirements.Requirement('pbr'),
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr'),
(None, 'pbr'): pkg_requirements.Requirement('pbr'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,
@@ -122,10 +122,10 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_new_lower(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr'),
(None, 'pbr'): pkg_requirements.Requirement('pbr'),
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>=1.6'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>=1.6'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,
@@ -136,10 +136,10 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_raised_lower(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>=1.5'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>=1.5'),
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>=1.6'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>=1.6'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,
@@ -150,10 +150,10 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_new_lower_format(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>=1.6'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>=1.6'),
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>=1.6.0'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>=1.6.0'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,
@@ -164,10 +164,10 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_new_lower_comparator(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>=1.6'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>=1.6'),
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>1.6'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>1.6'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,
@@ -178,10 +178,10 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_lower_comparator_with_same_version(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>2.1.0'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>2.1.0'),
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>2.1.0'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>2.1.0'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,
@@ -192,10 +192,10 @@ class TestCompareLowerBounds(base.BaseTestCase):
def test_lower_comparator_with_lower_new_minimum_version(self):
warnings = []
old = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>2.2.0'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>2.2.0'),
}
new = {
(None, 'pbr'): pkg_resources.Requirement.parse('pbr>2.1.0'),
(None, 'pbr'): pkg_requirements.Requirement('pbr>2.1.0'),
}
requirements.compare_lower_bounds(
old, new, warnings.append,