Skip to content

Commit a43f99f

Browse files
committed
Replace use of parse_requirements with _reqs.parse.
1 parent 157e36e commit a43f99f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

setuptools/dist.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
from setuptools.config import parse_configuration
4040
import pkg_resources
4141
from setuptools.extern.packaging import version
42+
from . import _reqs
4243

4344
if TYPE_CHECKING:
4445
from email.message import Message
@@ -280,7 +281,7 @@ def _check_extra(extra, reqs):
280281
name, sep, marker = extra.partition(':')
281282
if marker and pkg_resources.invalid_marker(marker):
282283
raise DistutilsSetupError("Invalid environment marker: " + marker)
283-
list(pkg_resources.parse_requirements(reqs))
284+
list(_reqs.parse(reqs))
284285

285286

286287
def assert_bool(dist, attr, value):
@@ -300,7 +301,7 @@ def invalid_unless_false(dist, attr, value):
300301
def check_requirements(dist, attr, value):
301302
"""Verify that install_requires is a valid requirements list"""
302303
try:
303-
list(pkg_resources.parse_requirements(value))
304+
list(_reqs.parse(value))
304305
if isinstance(value, (dict, set)):
305306
raise TypeError("Unordered types are not allowed")
306307
except (TypeError, ValueError) as error:
@@ -552,7 +553,7 @@ def _convert_extras_requirements(self):
552553
for section, v in spec_ext_reqs.items():
553554
# Do not strip empty sections.
554555
self._tmp_extras_require[section]
555-
for r in pkg_resources.parse_requirements(v):
556+
for r in _reqs.parse(v):
556557
suffix = self._suffix_for(r)
557558
self._tmp_extras_require[section + suffix].append(r)
558559

@@ -578,7 +579,7 @@ def is_simple_req(req):
578579
return not req.marker
579580

580581
spec_inst_reqs = getattr(self, 'install_requires', None) or ()
581-
inst_reqs = list(pkg_resources.parse_requirements(spec_inst_reqs))
582+
inst_reqs = list(_reqs.parse(spec_inst_reqs))
582583
simple_reqs = filter(is_simple_req, inst_reqs)
583584
complex_reqs = itertools.filterfalse(is_simple_req, inst_reqs)
584585
self.install_requires = list(map(str, simple_reqs))
@@ -818,7 +819,7 @@ def parse_config_files(self, filenames=None, ignore_option_errors=False):
818819
def fetch_build_eggs(self, requires):
819820
"""Resolve pre-setup requirements"""
820821
resolved_dists = pkg_resources.working_set.resolve(
821-
pkg_resources.parse_requirements(requires),
822+
_reqs.parse(requires),
822823
installer=self.fetch_build_egg,
823824
replace_conflicting=True,
824825
)

0 commit comments

Comments
 (0)