From 78c01dca5e80527a6f5f75ea6ab28c945dbf8a36 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Mon, 3 Mar 2025 17:09:28 +0100 Subject: [PATCH 1/3] chore: drop pkg_resources usage --- src/robotsuite/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/robotsuite/__init__.py b/src/robotsuite/__init__.py index c47e533..86c9e50 100644 --- a/src/robotsuite/__init__.py +++ b/src/robotsuite/__init__.py @@ -23,7 +23,6 @@ import doctest import logging import os -import pkg_resources import re import shutil import string @@ -38,13 +37,15 @@ from robot.reporting import ResultWriter from robot.running import TestSuiteBuilder +from importlib.metadata import distribution from lxml import etree +from packaging.version import parse as version_parse -try: - pkg_resources.get_distribution('robotframework>=3.2a1') +dist = distribution("robotframework>=3.2a1") + +if version_parse(dist.version) >= version_parse("3.2a1"): HAS_RF32_PARSER = True -except pkg_resources.VersionConflict: - import robot.parsing as robot_parsing +else: HAS_RF32_PARSER = False try: From 908f016b128ce28082b18d2a9788e4534c868663 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Mon, 3 Mar 2025 17:10:35 +0100 Subject: [PATCH 2/3] chore: adjust dependencies --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 5655b04..25c8ab8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,7 @@ install_requires = setuptools lxml robotframework>=2.8 + packaging tests_require = package_dir = = src From 015366b21e066f9272f928e7668e079e28eb605f Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Mon, 3 Mar 2025 17:10:24 +0100 Subject: [PATCH 3/3] Update CHANGES --- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index a1f411f..7093fe9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,8 +4,8 @@ Changelog 2.3.3 (unreleased) ------------------ -- Nothing changed yet. - +- Drop `pkg_resources` usage and replace it with `importlib.metadata` and `packaging. + [gforcada] 2.3.2 (2023-09-09) ------------------