Skip to content
Snippets Groups Projects
Commit 9ac98bdb authored by Georges Racinet's avatar Georges Racinet :squid:
Browse files

Merged stable branch into default and improved conditional import comment

Should fix test_package, which is not so much about Python 3.11 but
rather the version of `pkg_resources`
parents 709d40e0 840e9e41
Branches
Tags
1 merge request!103Merged stable branch into default and improved conditional import comment
Pipeline #84853 passed
Pipeline: hgitaly

#84854

    ......@@ -93,3 +93,6 @@
    c2bd2e18be152db58732e8f1790e96f3a85b9624 4.6.0
    81cbaf37563c27b1d68ad507b39cd7dddfc324a0 4.7.0
    0a0e973ee4d20135dc852598710d093bc21974f9 4.7.1
    87f86950013e66f229e6f259f9db1215394c9a2c 4.7.2
    de0f1641b5c81faea83215a0bf4d17ae31ce6185 4.7.3
    0bee446bb3380954fa5ff73bbbed8199477a205b 4.7.4
    4.7.2dev0
    4.7.5dev0
    ......@@ -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__)
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment