Skip to content
Snippets Groups Projects

Merged stable branch into default and improved conditional import comment

Merged Georges Racinet requested to merge topic/default/merge-stable into branch/default
3 files
+ 8
4
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -6,4 +6,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
try:
from pkg_resources import packaging
Version = packaging.version.Version # pragma no cover
except ImportError: # pragma no cover
@@ -9,9 +10,9 @@
except ImportError: # pragma no cover
# one day, `packaging` might not be vendored in `pkg_resources` any more
import packaging
# Seen first on Python >=3.11 but should be about `pkg_resources` version
from packaging.version import Version
import heptapod
def test_package_version():
# the Version class accepts only PEP440 compliant version strings
@@ -12,7 +13,7 @@
import heptapod
def test_package_version():
# the Version class accepts only PEP440 compliant version strings
packaging.version.Version(heptapod.__version__)
Version(heptapod.__version__)
Loading