Skip to content

Replace pkg resources use #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loqs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace pkg resources use #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba50563
setup.py: except ImportError for missing pkg_resources
loqs Mar 16, 2026
41f8aa0
conftest.py: Replace pkg_resources use with packaging
loqs Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions html5lib/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
import os.path
import sys

import pkg_resources
from packaging.requirements import Requirement
from packaging.markers import Marker
try:
from importlib import metadata
except ImportError:
import importlib_metadata as metadata
import pytest

from .tree_construction import TreeConstructionFile
Expand Down Expand Up @@ -63,17 +68,16 @@ def pytest_configure(config):
spec, marker = line.strip().split(";", 1)
else:
spec, marker = line.strip(), None
req = pkg_resources.Requirement.parse(spec)
if marker and not pkg_resources.evaluate_marker(marker):
req = Requirement(spec)
if marker and not Marker(marker).evaluate():
msgs.append("%s not available in this environment" % spec)
else:
try:
installed = pkg_resources.working_set.find(req)
except pkg_resources.VersionConflict:
msgs.append("Outdated version of %s installed, need %s" % (req.name, spec))
else:
if not installed:
msgs.append("Need %s" % spec)
installed = metadata.version(req.name)
if not req.specifier.contains(installed, prereleases=True):
msgs.append("Outdated version of %s installed, need %s" % (req.name, spec))
except metadata.PackageNotFoundError:
msgs.append("Need %s" % spec)

# Check cElementTree
import xml.etree.ElementTree as ElementTree
Expand Down
2 changes: 2 additions & 0 deletions requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ coverage>=5.1,<6
pytest-expect>=1.1.0,<2
mock>=3.0.5,<4 ; python_version < '3.3'
setuptools; python_version >= '3.12'
packaging
importlib-metadata; python_version < '3.8'
7 changes: 5 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@

from os.path import join, dirname
from setuptools import setup, find_packages, __version__ as setuptools_version
from pkg_resources import parse_version

import pkg_resources
try:
import pkg_resources
from pkg_resources import parse_version
except ImportError:
pkg_resources = None

try:
import _markerlib.markers
Expand Down