zpdatafetch 2.0.2__tar.gz → 2.0.3__tar.gz

{zpdatafetch-2.0.2 → zpdatafetch-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zpdatafetch
-Version: 2.0.2
+Version: 2.0.3
 Summary: A package for fetching data from Zwiftpower and Zwiftracing.app
 Author-email: Doug Morris <doug@mhost.com>
 License-Expression: MIT

{zpdatafetch-2.0.2 → zpdatafetch-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zpdatafetch"
-version = "2.0.2"
+version = "2.0.3"
 description = "A package for fetching data from Zwiftpower and Zwiftracing.app"
 readme = "README.md"
 requires-python = ">=3.10"

{zpdatafetch-2.0.2 → zpdatafetch-2.0.3}/src/shared/cli.py

@@ -7,17 +7,35 @@ functionality for both zpdatafetch and zrdatafetch CLIs.
 import logging
 from argparse import ArgumentParser, Namespace
 from collections.abc import Callable
+from importlib.metadata import PackageNotFoundError, version
+
+
+def get_package_version(package_name: str = 'zpdatafetch') -> str:
+  """Get version from installed package metadata.
+
+  Args:
+    package_name: Name of the package to get version for
+
+  Returns:
+    Version string from package metadata, or 'unknown' if not found
+  """
+  try:
+    return version(package_name)
+  except PackageNotFoundError:
+    return 'unknown'
 
 
 def create_base_parser(
   description: str,
   command_metavar: str,
+  package_name: str = 'zpdatafetch',
 ) -> ArgumentParser:
   """Create argument parser with common CLI arguments.
 
   Args:
     description: CLI description text
     command_metavar: Metavar for command choices (e.g., '{config,rider,result}')
+    package_name: Name of package for version string (default: 'zpdatafetch')
 
   Returns:
     ArgumentParser configured with common arguments for both packages.
@@ -25,6 +43,13 @@ def create_base_parser(
   """
   parser = ArgumentParser(description=description)
 
+  # Version argument
+  parser.add_argument(
+    '--version',
+    action='version',
+    version=f'%(prog)s {get_package_version(package_name)}',
+  )
+
   # Logging arguments
   parser.add_argument(
     '-v',

{zpdatafetch-2.0.2 → zpdatafetch-2.0.3}/src/zdatafetch/cli.py

@@ -10,6 +10,7 @@ from argparse import ArgumentParser
 from shared.cli import (
   configure_logging_from_args,
   format_noaction_output,
+  get_package_version,
   handle_config_command,
   validate_command_name,
   validate_command_provided,
@@ -55,6 +56,13 @@ Commands:
   # Create parser (custom for zdatafetch, no --v1fetch)
   p = ArgumentParser(description=desc)
 
+  # Version argument
+  p.add_argument(
+    '--version',
+    action='version',
+    version=f'%(prog)s {get_package_version()}',
+  )
+
   # Logging arguments
   p.add_argument(
     '-v',
@@ -223,9 +231,7 @@ Commands:
             for rider_id, profile in profiles.items():
               # Indent the profile output
               profile_str = str(profile)
-              indented = '\n'.join(
-                f'  {line}' for line in profile_str.split('\n')
-              )
+              indented = '\n'.join(f'  {line}' for line in profile_str.split('\n'))
               print(f'  {rider_id}: {indented.lstrip()},')
             print('}')
 
@@ -267,9 +273,7 @@ Commands:
             print('{')
             for rider_id, followers in followers_data.items():
               followers_str = str(followers)
-              indented = '\n'.join(
-                f'  {line}' for line in followers_str.split('\n')
-              )
+              indented = '\n'.join(f'  {line}' for line in followers_str.split('\n'))
               print(f'  {rider_id}: {indented.lstrip()},')
             print('}')
 
@@ -334,9 +338,7 @@ Commands:
               print('{')
               for key, rideons in rideons_data.items():
                 rideons_str = str(rideons)
-                indented = '\n'.join(
-                  f'  {line}' for line in rideons_str.split('\n')
-                )
+                indented = '\n'.join(f'  {line}' for line in rideons_str.split('\n'))
                 print(f'  {key}: {indented.lstrip()},')
               print('}')
 
@@ -370,9 +372,7 @@ Commands:
             print('{')
             for rider_id, activity in activities.items():
               activity_str = str(activity)
-              indented = '\n'.join(
-                f'  {line}' for line in activity_str.split('\n')
-              )
+              indented = '\n'.join(f'  {line}' for line in activity_str.split('\n'))
               print(f'  {rider_id}: {indented.lstrip()},')
             print('}')
 
@@ -445,9 +445,7 @@ Commands:
               print('{')
               for world_id, riders in riders_data.items():
                 riders_str = str(riders)
-                indented = '\n'.join(
-                  f'  {line}' for line in riders_str.split('\n')
-                )
+                indented = '\n'.join(f'  {line}' for line in riders_str.split('\n'))
                 print(f'  {world_id}: {indented.lstrip()},')
               print('}')
 

{zpdatafetch-2.0.2 → zpdatafetch-2.0.3}/src/zpdatafetch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zpdatafetch
-Version: 2.0.2
+Version: 2.0.3
 Summary: A package for fetching data from Zwiftpower and Zwiftracing.app
 Author-email: Doug Morris <doug@mhost.com>
 License-Expression: MIT