version-query 1.5.5rc1__tar.gz → 1.6.1.dev0__tar.gz

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/NOTICE

@@ -1,5 +1,5 @@
 version-query
-Copyright (c) 2017-2024  Mateusz Bysiek  https://mbdevpl.github.io/
+Copyright (c) 2017-2025  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.5.5rc1/version_query.egg-info → version_query-1.6.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: version-query
-Version: 1.5.5rc1
+Version: 1.6.1.dev0
 Summary: Zero-overhead package versioning for Python.
 Home-page: https://github.com/mbdevpl/version-query
 Download-URL: 
@@ -18,25 +18,38 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.8
 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 :: 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: boilerplates[cli,logging]~=1.0
 Requires-Dist: GitPython~=3.1
-Requires-Dist: packaging>=23.0
+Requires-Dist: packaging>=24.0
 Requires-Dist: semver<3.1,>=2.13
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. role:: bash(code)
     :language: bash
@@ -68,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.5.5rc1/NOTICE
+    :target: https://github.com/mbdevpl/version-query/blob/v1.6.1.dev0/NOTICE
     :alt: license
 
 Package versioning toolkit for Python which relies on git tags, git history traversal
@@ -476,10 +489,10 @@ using version-query without any issues.
 Requirements
 ============
 
-Python version 3.8 or later.
+Python version 3.9 or later.
 
-Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.5.5rc1/requirements.txt>`_.
+Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.6.1.dev0/requirements.txt>`_.
 
-Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.5.5rc1/requirements_test.txt>`_.
+Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.6.1.dev0/requirements_test.txt>`_.
 
 Tested on Linux, macOS and Windows.

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/README.rst

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

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/pyproject.toml

@@ -2,8 +2,8 @@
 requires = [
     'boilerplates[setup] ~= 1.0',
     'GitPython ~= 3.1',
-    'packaging >= 23.0',
-    'semver ~= 2.13'
+    'packaging >= 24.0',
+    'semver >= 2.13, < 3.1'
 ]
 
 [tool.flake8]

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/requirements.txt

@@ -1,4 +1,4 @@
 boilerplates[cli,logging] ~= 1.0
 GitPython ~= 3.1
-packaging >= 23.0
+packaging >= 24.0
 semver >= 2.13, < 3.1

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/setup.py

@@ -20,11 +20,11 @@ class Package(boilerplates.setup.Package):
         'Operating System :: MacOS',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 3.8',
         '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 :: Only',
         'Topic :: Software Development :: Version Control',
         'Topic :: Software Development :: Version Control :: Git',

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/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, 2024, author='the contributors', url='https://github.com/mbdevpl/version-query'),
+            2017, 2025, author='the contributors', url='https://github.com/mbdevpl/version-query'),
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     add_version_option(parser, VERSION)
 

version_query-1.6.1.dev0/version_query/py_query.py

@@ -0,0 +1,69 @@
+"""Python package version query tools."""
+
+import logging
+import json
+import pathlib
+
+from .version import Version
+
+_LOG = logging.getLogger(__name__)
+
+
+def query_metadata_json(path: pathlib.Path) -> Version:
+    """Get version from metadata.json file."""
+    with path.open('r') as metadata_file:
+        metadata = json.load(metadata_file)
+    version_str = metadata['version']
+    return Version.from_str(version_str)
+
+
+def query_pkg_info(path: pathlib.Path) -> Version:
+    """Get version from PKG-INFO file."""
+    with path.open('r') as pkginfo_file:
+        for line in pkginfo_file:
+            if line.startswith('Version:'):
+                version_str = line.replace('Version:', '').strip()
+                return Version.from_str(version_str)
+    raise ValueError(path)
+
+
+def query_package_folder(path: pathlib.Path, search_parent_directories: bool = False) -> Version:
+    """Get version from Python package folder."""
+    global_metadata_json_paths, global_pkg_info_paths = [], []
+    if path.joinpath('pyproject.toml').exists() or path.joinpath('setup.py').exists():
+        metadata_json_paths = list(path.glob('*.dist-info/metadata.json'))
+        pkg_info_paths = list(path.glob('*.egg-info/PKG-INFO'))
+        pkg_info_paths += list(path.glob('*.dist-info/METADATA'))
+        if len(metadata_json_paths) == 1 and not pkg_info_paths:
+            return query_metadata_json(metadata_json_paths[0])
+        if not metadata_json_paths and len(pkg_info_paths) == 1:
+            return query_pkg_info(pkg_info_paths[0])
+        _LOG.debug(
+            'in %s found pyproject.toml or setup.py, as well as'
+            ' %i JSON metadata: %s and %i PKG-INFO metadata: %s'
+            ' - unable to infer package metadata, continuing search',
+            path, len(metadata_json_paths), metadata_json_paths, len(pkg_info_paths),
+            pkg_info_paths)
+        global_metadata_json_paths.extend(metadata_json_paths)
+        global_pkg_info_paths.extend(pkg_info_paths)
+    paths = [path]
+    if search_parent_directories:
+        paths += path.parents
+    for pth in paths:
+        metadata_json_paths = list(pth.parent.glob(f'{pth.name}*.dist-info/metadata.json'))
+        pkg_info_paths = list(pth.parent.glob(f'{pth.name}*.egg-info/PKG-INFO'))
+        pkg_info_paths += list(pth.parent.glob(f'{pth.name}*.dist-info/METADATA'))
+        if len(metadata_json_paths) == 1 and not pkg_info_paths:
+            return query_metadata_json(metadata_json_paths[0])
+        if not metadata_json_paths and len(pkg_info_paths) == 1:
+            return query_pkg_info(pkg_info_paths[0])
+        _LOG.debug(
+            'in %s found %i JSON metadata: %s and %i PKG-INFO metadata: %s'
+            ' - unable to infer package metadata, continuing search',
+            pth, len(metadata_json_paths), metadata_json_paths, len(pkg_info_paths), pkg_info_paths)
+        global_metadata_json_paths.extend(metadata_json_paths)
+        global_pkg_info_paths.extend(pkg_info_paths)
+    raise ValueError(
+        f'unable to infer package metadata from the following paths {paths} '
+        f'- found {len(global_metadata_json_paths)} JSON metadata: {global_metadata_json_paths}'
+        f' and {len(global_pkg_info_paths)} PKG-INFO metadata: {global_pkg_info_paths}')

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/version_query/query.py

@@ -18,9 +18,9 @@ def _caller_folder(stack_level: int = 1) -> pathlib.Path:
     frame_info = inspect.getouterframes(inspect.currentframe())[stack_level]
     caller_path = frame_info[1]  # frame_info.filename
 
-    here = pathlib.Path(caller_path).absolute().resolve()
-    assert here.is_file(), here
-    here = here.parent
+    here = pathlib.Path(caller_path).absolute()
+    assert here.name == '<string>' or here.is_file(), here
+    here = here.parent.resolve()
     assert here.is_dir(), here
     _LOG.debug('found directory "%s"', here)
 

{version_query-1.5.5rc1 → version_query-1.6.1.dev0/version_query.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: version-query
-Version: 1.5.5rc1
+Version: 1.6.1.dev0
 Summary: Zero-overhead package versioning for Python.
 Home-page: https://github.com/mbdevpl/version-query
 Download-URL: 
@@ -18,25 +18,38 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.8
 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 :: 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: boilerplates[cli,logging]~=1.0
 Requires-Dist: GitPython~=3.1
-Requires-Dist: packaging>=23.0
+Requires-Dist: packaging>=24.0
 Requires-Dist: semver<3.1,>=2.13
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. role:: bash(code)
     :language: bash
@@ -68,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.5.5rc1/NOTICE
+    :target: https://github.com/mbdevpl/version-query/blob/v1.6.1.dev0/NOTICE
     :alt: license
 
 Package versioning toolkit for Python which relies on git tags, git history traversal
@@ -476,10 +489,10 @@ using version-query without any issues.
 Requirements
 ============
 
-Python version 3.8 or later.
+Python version 3.9 or later.
 
-Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.5.5rc1/requirements.txt>`_.
+Python libraries as specified in `requirements.txt <https://github.com/mbdevpl/version-query/blob/v1.6.1.dev0/requirements.txt>`_.
 
-Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.5.5rc1/requirements_test.txt>`_.
+Building and running tests additionally requires packages listed in `requirements_test.txt <https://github.com/mbdevpl/version-query/blob/v1.6.1.dev0/requirements_test.txt>`_.
 
 Tested on Linux, macOS and Windows.

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/version_query.egg-info/SOURCES.txt

@@ -21,11 +21,21 @@ setup.py
 ./version_query/py_query.py
 ./version_query/query.py
 ./version_query/version.py
+test/__init__.py
 test/examples.py
 test/test_git.py
 test/test_packaging.py
 test/test_query.py
 test/test_version.py
+version_query/__init__.py
+version_query/__main__.py
+version_query/_version.py
+version_query/git_query.py
+version_query/main.py
+version_query/py.typed
+version_query/py_query.py
+version_query/query.py
+version_query/version.py
 version_query.egg-info/PKG-INFO
 version_query.egg-info/SOURCES.txt
 version_query.egg-info/dependency_links.txt

{version_query-1.5.5rc1 → version_query-1.6.1.dev0}/version_query.egg-info/requires.txt

@@ -1,4 +1,4 @@
 boilerplates[cli,logging]~=1.0
 GitPython~=3.1
-packaging>=23.0
+packaging>=24.0
 semver<3.1,>=2.13

version_query-1.5.5rc1/version_query/py_query.py

@@ -1,44 +0,0 @@
-"""Python package version query tools."""
-
-import logging
-import json
-import pathlib
-
-from .version import Version
-
-_LOG = logging.getLogger(__name__)
-
-
-def query_metadata_json(path: pathlib.Path) -> Version:
-    """Get version from metadata.json file."""
-    with path.open('r') as metadata_file:
-        metadata = json.load(metadata_file)
-    version_str = metadata['version']
-    return Version.from_str(version_str)
-
-
-def query_pkg_info(path: pathlib.Path) -> Version:
-    """Get version from PKG-INFO file."""
-    with path.open('r') as pkginfo_file:
-        for line in pkginfo_file:
-            if line.startswith('Version:'):
-                version_str = line.replace('Version:', '').strip()
-                return Version.from_str(version_str)
-    raise ValueError(path)
-
-
-def query_package_folder(path: pathlib.Path, search_parent_directories: bool = False) -> Version:
-    """Get version from Python package folder."""
-    paths = [path]
-    if search_parent_directories:
-        paths += path.parents
-    metadata_json_paths, pkg_info_paths = None, None
-    for pth in paths:
-        metadata_json_paths = list(pth.parent.glob(f'{pth.name}*.dist-info/metadata.json'))
-        pkg_info_paths = list(pth.parent.glob(f'{pth.name}*.egg-info/PKG-INFO'))
-        pkg_info_paths += list(pth.parent.glob(f'{pth.name}*.dist-info/METADATA'))
-        if len(metadata_json_paths) == 1 and not pkg_info_paths:
-            return query_metadata_json(metadata_json_paths[0])
-        if not metadata_json_paths and len(pkg_info_paths) == 1:
-            return query_pkg_info(pkg_info_paths[0])
-    raise ValueError(paths, metadata_json_paths, pkg_info_paths)