proxygen-cli 2.1.16__tar.gz → 2.1.18__tar.gz

{proxygen_cli-2.1.16 → proxygen_cli-2.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proxygen-cli
-Version: 2.1.16
+Version: 2.1.18
 Summary: CLI for interacting with NHSD APIM's proxygen service
 Home-page: https://github.com/NHSDigital/proxygen-cli
 Author: Ben Strutt
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: cryptography (>=42,<44)
 Requires-Dist: lxml (>=4.7.1,<5.0.0)
+Requires-Dist: packaging (>=24.2,<25.0)
 Requires-Dist: pydantic (>=1.9.1,<2.0.0)
 Requires-Dist: pyjwt (>=2.3.0,<3.0.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)

{proxygen_cli-2.1.16 → proxygen_cli-2.1.18}/proxygen_cli/cli/command_main.py

@@ -1,6 +1,5 @@
 import click
 from proxygen_cli.lib.settings import SETTINGS
-
 from proxygen_cli.lib import proxygen_api, output
 from proxygen_cli.cli import (
     command_credentials,
@@ -12,12 +11,11 @@ from proxygen_cli.cli import (
     command_pytest_nhsd_apim_token
 )
 
-
 @click.group()
+@click.version_option(prog_name="proxygen")  # Automatically adds version option
 def main():
     """Main group"""
 
-
 main.add_command(command_settings.settings)
 main.add_command(command_credentials.credentials)
 main.add_command(command_instance.instance)
@@ -26,7 +24,6 @@ main.add_command(command_secret.secret)
 main.add_command(command_docker.docker)
 main.add_command(command_pytest_nhsd_apim_token.pytest_nhsd_apim)
 
-
 @main.command()
 def status():
     """
@@ -37,6 +34,5 @@ def status():
         {"proxygen_url": str(SETTINGS.endpoint_url), "response": status}
     )
 
-
 if __name__ == "__main__":
     main()

{proxygen_cli-2.1.16 → proxygen_cli-2.1.18}/proxygen_cli/test/command_main_test.py

@@ -1,9 +1,7 @@
 import json
 from unittest.mock import patch
-
 from click.testing import CliRunner
-
-from proxygen_cli.cli.command_main import status
+from proxygen_cli.cli.command_main import status, main  # Import `main` for the version test
 from proxygen_cli.lib.settings import Settings
 from proxygen_cli.test.command_settings_test import get_test_settings
 
@@ -24,3 +22,15 @@ def test_proxygen_status(patch_config, patch_request):
         "proxygen_url": "https://mock-proxygen.nhs.uk",
         "response": {"mock_return": "value"},
     }
+
+def test_main_version():
+    runner = CliRunner()
+    result = runner.invoke(main, ['--version'])  # Correctly invoke the main CLI group
+    assert result.exit_code == 0
+    version_output = result.output.strip()  # Clean up the output by stripping whitespace
+
+    # Print the version output to the console
+    print(f"Version Output: {version_output}")  # This will print the version during the test
+
+    # Assert that the output contains the version information automatically provided by Click
+    assert "proxygen, version" in version_output  # This works as Click handles versioning

{proxygen_cli-2.1.16 → proxygen_cli-2.1.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "proxygen-cli"
-version = "2.1.16"
+version = "2.1.18"
 description = "CLI for interacting with NHSD APIM's proxygen service"
 authors = ["Ben Strutt <ben.strutt1@nhs.net>"]
 readme = "README.md"
@@ -21,7 +21,7 @@ cryptography = ">=42,<44"
 pyyaml = "^6.0"
 yaspin = "^2.2.0"
 tabulate = "^0.9.0"
-
+packaging = "^24.2"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.2.1"