version-query 1.7.0rc1__tar.gz → 1.7.1__tar.gz

{version_query-1.7.0rc1 → version_query-1.7.1}/NOTICE

@@ -1,5 +1,5 @@
 version-query
-Copyright (c) 2017-2025  Mateusz Bysiek  https://mbdevpl.github.io/
+Copyright (c) 2017-2026  Mateusz Bysiek  https://mbdevpl.github.io/
 Copyright (c) 2020  John Vandenberg  https://github.com/jayvdb
 
 Licensed under the Apache License, Version 2.0 (the "License");

{version_query-1.7.0rc1/version_query.egg-info → version_query-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: version-query
-Version: 1.7.0rc1
+Version: 1.7.1
 Summary: Zero-overhead package versioning for Python.
 Home-page: https://github.com/mbdevpl/version-query
 Download-URL: 
@@ -17,18 +17,18 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Version Control
 Classifier: Topic :: Software Development :: Version Control :: Git
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: NOTICE
@@ -81,7 +81,7 @@ Zero-overhead package versioning for Python.
     :alt: grade from Codacy
 
 .. image:: https://img.shields.io/github/license/mbdevpl/version-query.svg
-    :target: https://github.com/mbdevpl/version-query/blob/v1.7.0rc1/NOTICE
+    :target: https://github.com/mbdevpl/version-query/blob/v1.7.1/NOTICE
     :alt: license
 
 Package versioning toolkit for Python which relies on git tags, git history traversal
@@ -570,10 +570,10 @@ using version-query without any issues.
 Requirements
 ============
 
-Python version 3.9 or later.
+Python version 3.10 or later.
 
-Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.7.0rc1/requirements.txt>`_.
+Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.7.1/requirements.txt>`_.
 
-Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.7.0rc1/requirements_test.txt>`_.
+Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.7.1/requirements_test.txt>`_.
 
 Tested on Linux, macOS and Windows.

{version_query-1.7.0rc1 → version_query-1.7.1}/README.rst

@@ -517,7 +517,7 @@ using version-query without any issues.
 Requirements
 ============
 
-Python version 3.9 or later.
+Python version 3.10 or later.
 
 Python libraries as specified in `<requirements.txt>`_.
 

{version_query-1.7.0rc1 → version_query-1.7.1}/setup.py

@@ -19,11 +19,11 @@ class Package(boilerplates.setup.Package):
         'Operating System :: MacOS',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Programming Language :: Python :: 3 :: Only',
         'Topic :: Software Development :: Version Control',
         'Topic :: Software Development :: Version Control :: Git',

{version_query-1.7.0rc1 → version_query-1.7.1}/test/__init__.py

@@ -12,3 +12,6 @@ class TestsLogging(Logging):
 
 
 TestsLogging.configure()
+logging.getLogger('version_query.git_query').setLevel(logging.INFO)
+logging.getLogger('version_query.parser').setLevel(logging.INFO)
+logging.getLogger('version_query.version').setLevel(logging.INFO)

{version_query-1.7.0rc1 → version_query-1.7.1}/test/examples.py

@@ -11,7 +11,7 @@ from version_query.version import VersionComponent
 
 _GIT_REPOS_ROOT = pathlib.Path(os.environ.get('EXAMPLE_PROJECTS_PATH', '..')).resolve()
 
-GIT_REPO_EXAMPLES = list(_ for _ in _GIT_REPOS_ROOT.glob('**/.git') if _.is_dir())
+GIT_REPO_EXAMPLES = list(_.parent for _ in _GIT_REPOS_ROOT.glob('**/.git') if _.is_dir())
 
 
 def python_lib_dir() -> pathlib.Path:

{version_query-1.7.0rc1 → version_query-1.7.1}/test/test_cli.py

@@ -3,6 +3,7 @@
 import contextlib
 import io
 import logging
+import os
 import runpy
 import sys
 import unittest
@@ -42,6 +43,9 @@ class Tests(unittest.TestCase):
     def test_not_as_main(self):  # pylint: disable = no-self-use
         run_module('version_query', run_name='__not_main__')
 
+    @unittest.skipUnless(
+        os.environ.get('TEST_CLI') or os.environ.get('CI'),
+        'skipping CLI test which breaks test logging')
     def test_help(self):
         sio = io.StringIO()
         with contextlib.redirect_stderr(sio), preserve_logger_level('version_query'), \
@@ -49,6 +53,9 @@ class Tests(unittest.TestCase):
             run_module('version_query')
         _LOG.info('%s', sio.getvalue())
 
+    @unittest.skipUnless(
+        os.environ.get('TEST_CLI') or os.environ.get('CI'),
+        'skipping CLI test which breaks test logging')
     def test_bad_usage(self):
         sio = io.StringIO()
         with contextlib.redirect_stderr(sio), preserve_logger_level('version_query'), \
@@ -56,6 +63,9 @@ class Tests(unittest.TestCase):
             run_module('version_query', '-p', '-i', '.')
         _LOG.info('%s', sio.getvalue())
 
+    @unittest.skipUnless(
+        os.environ.get('TEST_CLI') or os.environ.get('CI'),
+        'skipping CLI test which breaks test logging')
     def test_here(self):
         sio = io.StringIO()
         with temporarily_set_logger_level('version_query', logging.ERROR), \
@@ -64,6 +74,9 @@ class Tests(unittest.TestCase):
         self.assertEqual(sio.getvalue().rstrip(), query_caller().to_str())
         self.assertEqual(sio.getvalue().rstrip(), query_version_str())
 
+    @unittest.skipUnless(
+        os.environ.get('TEST_CLI') or os.environ.get('CI'),
+        'skipping CLI test which breaks test logging')
     def test_increment_here(self):
         sio = io.StringIO()
         with temporarily_set_logger_level('version_query', logging.ERROR), \
@@ -72,6 +85,9 @@ class Tests(unittest.TestCase):
         self.assertEqual(sio.getvalue().rstrip(),
                          query_caller().increment(VersionComponent.Patch).to_str())
 
+    @unittest.skipUnless(
+        os.environ.get('TEST_CLI') or os.environ.get('CI'),
+        'skipping CLI test which breaks test logging')
     def test_predict_here(self):
         sio = io.StringIO()
         with temporarily_set_logger_level('version_query', logging.ERROR), \

{version_query-1.7.0rc1 → version_query-1.7.1}/test/test_git.py

@@ -2,6 +2,7 @@
 
 import itertools
 import logging
+import os
 import platform
 import unittest
 
@@ -79,6 +80,19 @@ class Tests(boilerplates.git_repo_tests.GitRepoTests):
         version.local = (f'git{self.repo_head_hexsha}',)
         self.assertEqual(version, upcoming_version)
 
+    def test_too_short_version_tag(self):
+        self.git_commit_new_file()
+        self.repo.create_tag('v1.0')
+        self.git_commit_new_file()
+        self.repo.create_tag('v')
+        self.git_commit_new_file()
+        self.repo.create_tag('ver')
+        current_version = query_git_repo(self.repo_path)
+        _LOG.debug('current version is %s', current_version)
+        self.assertEqual(current_version.to_str(), '1.0')
+
+    @unittest.skipUnless(
+        os.environ.get('TEST_LONG') or os.environ.get('CI'), 'skipping long test')
     def test_too_long_no_tag(self):
         self.git_commit_new_file()
         self.repo.create_tag('v4.0.0')

{version_query-1.7.0rc1 → version_query-1.7.1}/test/test_query.py

@@ -23,6 +23,15 @@ _LOG = logging.getLogger(__name__)
 
 
 class Tests(unittest.TestCase):
+    """Test querying tools from several modules.
+
+    Note:
+
+    Tests that run setup script directly fail due to conflict between distutils used internally
+    by setuptools and distutils used internally by pip. For more information, see:
+    - https://github.com/pypa/setuptools/issues/3297
+    - https://github.com/pypa/pip/issues/8761
+    """
 
     def _check_examples_count(self, description, examples):
         lvl = logging.WARNING if len(examples) < 10 else logging.INFO
@@ -51,8 +60,11 @@ class Tests(unittest.TestCase):
                 else:
                     _LOG.debug('%s: %s', path, version)
 
+    @unittest.skipUnless(
+        os.environ.get('TEST_LONG') or os.environ.get('CI'), 'skipping long test')
     def test_query_git_repo(self):
         self._check_examples_count('git repo', GIT_REPO_EXAMPLES)
+        _LOG.debug('testing query_git_repo() on %i repositories', len(GIT_REPO_EXAMPLES))
         self._query_test_case(GIT_REPO_EXAMPLES, query_git_repo)
 
     def test_predict_caller_bad(self):
@@ -72,7 +84,10 @@ class Tests(unittest.TestCase):
             _LOG.warning('removed %s from sys.path', project_path_str)
             project_file_path.unlink()
 
+    @unittest.skipUnless(
+        os.environ.get('TEST_LONG') or os.environ.get('CI'), 'skipping long test')
     def test_predict_git_repo(self):
+        _LOG.debug('testing predict_git_repo() on %i repositories', len(GIT_REPO_EXAMPLES))
         self._query_test_case(GIT_REPO_EXAMPLES, predict_git_repo)
 
     @unittest.skipIf(not METADATA_JSON_EXAMPLE_PATHS, 'no "metadata.json" files found')
@@ -87,6 +102,7 @@ class Tests(unittest.TestCase):
 
     @unittest.skipUnless(
             os.environ.get('TEST_PACKAGING') or os.environ.get('CI'), 'skipping packaging test')
+    @unittest.skipIf(sys.version_info < (3, 12), 'requires Python 3.12+')
     def test_query_pkg_info_current(self):
         with preserve_logger_level('version_query'):
             run_module('setup', 'build')
@@ -120,6 +136,7 @@ class Tests(unittest.TestCase):
 
     @unittest.skipUnless(
             os.environ.get('TEST_PACKAGING') or os.environ.get('CI'), 'skipping packaging test')
+    @unittest.skipIf(sys.version_info < (3, 12), 'requires Python 3.12+')
     def test_query_package_folder_current(self):
         with preserve_logger_level('version_query'):
             run_module('setup', 'build')

{version_query-1.7.0rc1 → version_query-1.7.1}/test/test_version.py

@@ -4,7 +4,6 @@ import logging
 import unittest
 
 import packaging.version
-import pkg_resources
 import semver
 
 from version_query.version import VersionComponent, Version
@@ -23,13 +22,12 @@ class Tests(unittest.TestCase):
         for version_str, (args, kwargs) in STR_CASES.items():
             version_tuple = case_to_version_tuple(args, kwargs)
             with self.subTest(version_str=version_str, version_tuple=version_tuple):
-
                 py_version = \
-                    pkg_resources.parse_version(version_str)
+                    packaging.version.parse(version_str)
                 _LOG.debug('packaging parsed version string %s into %s: %s',
                            repr(version_str), type(py_version), py_version)
-                # self.assertIsInstance(
-                #     py_version, packaging.version.Version, msg=(type(py_version), py_version))
+                self.assertIsInstance(
+                    py_version, packaging.version.Version, msg=(type(py_version), py_version))
 
                 try:
                     sem_version = semver.VersionInfo.parse(version_str)
@@ -38,8 +36,8 @@ class Tests(unittest.TestCase):
                 else:
                     _LOG.debug('semver parsed version string %s into %s: %s',
                                repr(version_str), type(sem_version), sem_version)
-                # self.assertIsInstance(
-                #     sem_version, semver.VersionInfo, msg=(type(sem_version), sem_version))
+                    self.assertIsInstance(
+                        sem_version, semver.VersionInfo, msg=(type(sem_version), sem_version))
 
                 self.assertEqual(Version.from_str(version_str).to_tuple(), version_tuple)
 
@@ -59,7 +57,7 @@ class Tests(unittest.TestCase):
                 py_version = packaging.version.Version(version_str)
                 self.assertEqual(Version.from_py_version(py_version).to_tuple(),
                                  version_tuple, py_version)
-                py_version_setuptools = pkg_resources.parse_version(version_str)
+                py_version_setuptools = packaging.version.parse(version_str)
                 self.assertEqual(Version.from_py_version(py_version_setuptools).to_tuple(),
                                  version_tuple, py_version_setuptools)
 
@@ -71,7 +69,6 @@ class Tests(unittest.TestCase):
                 py_version = packaging.version.Version(version_str)
                 self.assertEqual(version.to_py_version(), py_version,
                                  msg=(version.to_py_version(), py_version))
-                # py_version_setuptools = pkg_resources.parse_version(version_str)
 
     def test_from_sem_version(self):
         for version_str, (args, kwargs) in COMPATIBLE_STR_CASES.items():

{version_query-1.7.0rc1 → version_query-1.7.1}/version_query/git_query.py

@@ -15,19 +15,23 @@ _LOG = logging.getLogger(__name__)
 def preprocess_git_version_tag(tag: str):
     """Remove a prefix from a version tag."""
     if tag.startswith('ver'):
+        if len(tag) == 3:
+            raise ValueError(f'the tag "{tag}" does not contain any version information')
         return tag[3:]
     if tag.startswith('v'):
+        if len(tag) == 1:
+            raise ValueError(f'the tag "{tag}" does not contain any version information')
         return tag[1:]
     if tag and tag[0] in ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9'):
         return tag
-    raise ValueError(f'given tag "{tag}" does not appear to be a version tag')
+    raise ValueError(f'the tag "{tag}" does not appear to be a version tag')
 
 
 def _git_version_tags(repo: git.Repo) -> t.Mapping[git.Tag, Version]:
     versions = {}
     for tag in repo.tags:
         try:
-            tag_str = preprocess_git_version_tag(str(tag))
+            tag_str = preprocess_git_version_tag(tag.name)
         except ValueError:
             _LOG.debug('%s: ignoring non-version tag %s', repo, tag)
             continue
@@ -35,7 +39,7 @@ def _git_version_tags(repo: git.Repo) -> t.Mapping[git.Tag, Version]:
             versions[tag] = Version.from_str(tag_str)
         except ValueError:
             # except packaging.version.InvalidVersion:
-            _LOG.warning('%s: failed to convert %s to version', repo, tag_str)
+            _LOG.warning('%s: failed to convert %s (%r) to version', repo, tag.name, tag_str)
             continue
     return versions
 

{version_query-1.7.0rc1 → version_query-1.7.1}/version_query/main.py

@@ -20,7 +20,7 @@ def main(args=None, namespace=None) -> None:
         description='''Tool for querying current versions of Python packages. Use LOGGING_LEVEL
         environment variable to adjust logging level.''',
         epilog=make_copyright_notice(
-            2017, 2025, author='the contributors', url='https://github.com/mbdevpl/version-query'),
+            2017, 2026, author='the contributors', url='https://github.com/mbdevpl/version-query'),
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     add_version_option(parser, VERSION)
 

{version_query-1.7.0rc1 → version_query-1.7.1/version_query.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: version-query
-Version: 1.7.0rc1
+Version: 1.7.1
 Summary: Zero-overhead package versioning for Python.
 Home-page: https://github.com/mbdevpl/version-query
 Download-URL: 
@@ -17,18 +17,18 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Version Control
 Classifier: Topic :: Software Development :: Version Control :: Git
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: NOTICE
@@ -81,7 +81,7 @@ Zero-overhead package versioning for Python.
     :alt: grade from Codacy
 
 .. image:: https://img.shields.io/github/license/mbdevpl/version-query.svg
-    :target: https://github.com/mbdevpl/version-query/blob/v1.7.0rc1/NOTICE
+    :target: https://github.com/mbdevpl/version-query/blob/v1.7.1/NOTICE
     :alt: license
 
 Package versioning toolkit for Python which relies on git tags, git history traversal
@@ -570,10 +570,10 @@ using version-query without any issues.
 Requirements
 ============
 
-Python version 3.9 or later.
+Python version 3.10 or later.
 
-Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.7.0rc1/requirements.txt>`_.
+Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.7.1/requirements.txt>`_.
 
-Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.7.0rc1/requirements_test.txt>`_.
+Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.7.1/requirements_test.txt>`_.
 
 Tested on Linux, macOS and Windows.