globus-cli 3.22.0__tar.gz → 3.24.0__tar.gz

{globus-cli-3.22.0 → globus-cli-3.24.0}/PKG-INFO

@@ -1,52 +1,39 @@
 Metadata-Version: 2.1
 Name: globus-cli
-Version: 3.22.0
+Version: 3.24.0
 Summary: Globus CLI
-Home-page: https://github.com/globus/globus-cli
-Author: Stephen Rosen
-Author-email: sirosen@globus.org
+Author-email: Stephen Rosen <sirosen@globus.org>
+Project-URL: homepage, https://github.com/globus/globus-cli
 Keywords: globus,cli,command line
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 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
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: globus-sdk==3.33.0
+Requires-Dist: globus-sdk==3.34.0
 Requires-Dist: click<9,>=8.1.4
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: packaging>=17.0
+Requires-Dist: typing_extensions>=4.0; python_version < "3.11"
 Requires-Dist: requests<3.0.0,>=2.19.1
 Requires-Dist: cryptography>=3.3.1
-Requires-Dist: typing_extensions>=4.0; python_version < "3.11"
 Provides-Extra: test
 Requires-Dist: coverage>=7; extra == "test"
 Requires-Dist: pytest>=7; extra == "test"
-Requires-Dist: pytest-xdist<3; extra == "test"
-Requires-Dist: pytest-timeout<2; extra == "test"
-Requires-Dist: click-type-test==0.0.5; python_version >= "3.10" and extra == "test"
-Requires-Dist: responses==0.23.3; extra == "test"
-Requires-Dist: ruamel.yaml==0.17.32; extra == "test"
+Requires-Dist: pytest-xdist<4; extra == "test"
+Requires-Dist: pytest-timeout<3; extra == "test"
+Requires-Dist: click-type-test==0.0.7; python_version >= "3.10" and extra == "test"
+Requires-Dist: responses==0.24.1; extra == "test"
+Requires-Dist: ruamel.yaml==0.18.5; extra == "test"
 Requires-Dist: setuptools; python_version >= "3.12" and extra == "test"
-Provides-Extra: development
-Requires-Dist: coverage>=7; extra == "development"
-Requires-Dist: pytest>=7; extra == "development"
-Requires-Dist: pytest-xdist<3; extra == "development"
-Requires-Dist: pytest-timeout<2; extra == "development"
-Requires-Dist: click-type-test==0.0.5; python_version >= "3.10" and extra == "development"
-Requires-Dist: responses==0.23.3; extra == "development"
-Requires-Dist: ruamel.yaml==0.17.32; extra == "development"
-Requires-Dist: setuptools; python_version >= "3.12" and extra == "development"
-Requires-Dist: tox>=4; extra == "development"
-Requires-Dist: scriv==1.3.1; extra == "development"
 
 .. image:: https://github.com/globus/globus-cli/workflows/build/badge.svg?event=push
     :alt: build status

globus-cli-3.24.0/pyproject.toml

@@ -0,0 +1,79 @@
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "globus-cli"
+description = "Globus CLI"
+readme = "README.rst"
+authors = [
+    { name = "Stephen Rosen", email = "sirosen@globus.org" },
+]
+keywords = [
+    "globus",
+    "cli",
+    "command line",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: POSIX",
+    "Programming Language :: Python",
+    "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",
+]
+requires-python = ">=3.8"
+dependencies = [
+    "globus-sdk==3.34.0",
+    "click>=8.1.4,<9",
+    "jmespath==1.0.1",
+    "packaging>=17.0",
+    "typing_extensions>=4.0;python_version<'3.11'",
+    # these are dependencies of the SDK, but they are used directly in the CLI
+    # declare them here in case the underlying lib ever changes
+    "requests>=2.19.1,<3.0.0",
+    "cryptography>=3.3.1",
+]
+dynamic = ["version"]
+
+[project.urls]
+homepage = "https://github.com/globus/globus-cli"
+
+[project.optional-dependencies]
+test = [
+    "coverage>=7",
+    "pytest>=7",
+    "pytest-xdist<4",
+    "pytest-timeout<3",
+    "click-type-test==0.0.7;python_version>='3.10'",
+    "responses==0.24.1",
+    # loading test fixture data
+    "ruamel.yaml==0.18.5",
+    # Python 3.12 needs setuptools.
+    "setuptools;python_version>='3.12'",
+]
+
+[project.scripts]
+globus = "globus_cli:main"
+
+[tool.setuptools.dynamic.version]
+attr = "globus_cli.version.__version__"
+
+[tool.isort]
+profile = "black"
+
+[tool.pytest.ini_options]
+addopts = "--timeout 3"
+filterwarnings = ["error"]
+
+[tool.scriv]
+version = "literal: src/globus_cli/version.py: __version__"
+categories = "Bugfixes, Enhancements, Other"
+# we're using adoc, we'll produce fragments as 'md' and "fix" later
+format = "md"
+output_file = "changelog.adoc"
+entry_title_template = '{{ version }} ({{ date.strftime("%Y-%m-%d") }})'

globus-cli-3.24.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

globus-cli-3.24.0/setup.py

@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()

{globus-cli-3.22.0 → globus-cli-3.24.0}/src/globus_cli/_warnings.py

@@ -1,11 +1,6 @@
-import sys
+import typing as t
 import warnings
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 # this bool turns off all warning controls, handing control of python
 # warnings to the testsuite
 # this ensures that `pytest --filterwarnings error` works
@@ -13,7 +8,7 @@ _TEST_WARNING_CONTROL: bool = False
 
 
 def simplefilter(
-    filterstr: Literal["default", "error", "ignore", "always", "module", "once"]
+    filterstr: t.Literal["default", "error", "ignore", "always", "module", "once"]
 ) -> None:
     """
     wrap `warnings.simplefilter` with a check on `_TEST_WARNING_CONTROL`

{globus-cli-3.22.0 → globus-cli-3.24.0}/src/globus_cli/commands/api.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import json
-import sys
 import typing as t
 import uuid
 from collections import defaultdict
@@ -16,11 +15,6 @@ from globus_cli.parsing import command, endpoint_id_arg, group, mutex_option_gro
 from globus_cli.termio import display
 from globus_cli.types import ServiceNameLiteral
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 C = t.TypeVar("C", bound=t.Union[t.Callable, click.Command])
 
 
@@ -255,13 +249,13 @@ def _service_command_params(cmd: C) -> C:
 def _execute_service_command(
     client: globus_sdk.BaseClient,
     *,
-    method: Literal["HEAD", "GET", "PUT", "POST", "PATCH", "DELETE"],
+    method: t.Literal["HEAD", "GET", "PUT", "POST", "PATCH", "DELETE"],
     path: str,
     query_param: tuple[tuple[str, str], ...],
     header: tuple[tuple[str, str], ...],
     body: str | None,
     body_file: t.TextIO | None,
-    content_type: Literal["json", "form", "text", "none", "auto"],
+    content_type: t.Literal["json", "form", "text", "none", "auto"],
     allow_errors: bool,
     allow_redirects: bool,
     no_retry: bool,
@@ -356,7 +350,7 @@ def api_command() -> None:
 
 # note: this must be written as a separate call and not inlined into the loop body
 # this ensures that it acts as a closure over 'service_name'
-def build_command(service_name: ServiceNameLiteral | Literal["gcs"]) -> click.Command:
+def build_command(service_name: ServiceNameLiteral | t.Literal["gcs"]) -> click.Command:
     helptext = f"""\
 Make API calls to Globus {service_name.title()}
 
@@ -377,13 +371,13 @@ sends a 'GET' request to '{_get_url(service_name)}foo/bar'
         def service_command(
             login_manager: LoginManager,
             *,
-            method: Literal["HEAD", "GET", "PUT", "POST", "PATCH", "DELETE"],
+            method: t.Literal["HEAD", "GET", "PUT", "POST", "PATCH", "DELETE"],
             path: str,
             query_param: tuple[tuple[str, str], ...],
             header: tuple[tuple[str, str], ...],
             body: str | None,
             body_file: t.TextIO | None,
-            content_type: Literal["json", "form", "text", "none", "auto"],
+            content_type: t.Literal["json", "form", "text", "none", "auto"],
             allow_errors: bool,
             allow_redirects: bool,
             no_retry: bool,
@@ -419,13 +413,13 @@ sends a 'GET' request to '{_get_url(service_name)}foo/bar'
             login_manager: LoginManager,
             *,
             endpoint_id: uuid.UUID,
-            method: Literal["HEAD", "GET", "PUT", "POST", "PATCH", "DELETE"],
+            method: t.Literal["HEAD", "GET", "PUT", "POST", "PATCH", "DELETE"],
             path: str,
             query_param: tuple[tuple[str, str], ...],
             header: tuple[tuple[str, str], ...],
             body: str | None,
             body_file: t.TextIO | None,
-            content_type: Literal["json", "form", "text", "none", "auto"],
+            content_type: t.Literal["json", "form", "text", "none", "auto"],
             allow_errors: bool,
             allow_redirects: bool,
             no_retry: bool,
@@ -454,5 +448,6 @@ sends a 'GET' request to '{_get_url(service_name)}foo/bar'
 
 for service_name_ in CLI_SCOPE_REQUIREMENTS:
     api_command.add_command(build_command(service_name_))
+del service_name_
 
 api_command.add_command(build_command("gcs"))

{globus-cli-3.22.0 → globus-cli-3.24.0}/src/globus_cli/commands/collection/_common.py

@@ -1,11 +1,42 @@
 from __future__ import annotations
 
+import click
 import globus_sdk
 
+from globus_cli.login_manager.utils import get_current_identity_id
 from globus_cli.termio import Field, formatters
 from globus_cli.types import DATA_CONTAINER_T
 
 
+class LazyCurrentIdentity:
+    def __init__(self, value: str | None) -> None:
+        self._value = value
+
+    @property
+    def value(self) -> str:
+        if self._value is None:
+            self._value = get_current_identity_id()
+        return str(self._value)
+
+
+def _identity_id_callback(
+    ctx: click.Context | None,
+    param: click.Parameter | None,
+    value: str | None,
+) -> LazyCurrentIdentity:
+    return LazyCurrentIdentity(value)
+
+
+# NB: this is implemented using a callback rather than a custom type because this lets
+# us ensure that we convert the default of `None` to `LazyCurrentIdentity(None)`
+# a custom type would still pass a default of `None` unless a callback were specified
+identity_id_option = click.option(
+    "--identity-id",
+    help="User who should own the collection (defaults to the current user)",
+    callback=_identity_id_callback,
+)
+
+
 def filter_fields(check_fields: list[Field], data: DATA_CONTAINER_T) -> list[Field]:
     return [f for f in check_fields if f.get_value(data) is not None]
 

{globus-cli-3.22.0 → globus-cli-3.24.0}/src/globus_cli/commands/collection/create/__init__.py

@@ -5,6 +5,7 @@ from globus_cli.parsing import group
     "create",
     lazy_subcommands={
         "guest": (".guest", "collection_create_guest"),
+        "mapped": (".mapped", "collection_create_mapped"),
     },
 )
 def collection_create() -> None:

{globus-cli-3.22.0 → globus-cli-3.24.0}/src/globus_cli/commands/collection/create/guest.py

@@ -8,14 +8,15 @@ import globus_sdk
 import globus_sdk.experimental.auth_requirements_error
 
 from globus_cli.commands.collection._common import (
+    LazyCurrentIdentity,
     filter_fields,
+    identity_id_option,
     standard_collection_fields,
 )
 from globus_cli.constants import ExplicitNullType
 from globus_cli.endpointish import EntityType
 from globus_cli.login_manager import LoginManager, MissingLoginError
 from globus_cli.login_manager.context import LoginContext
-from globus_cli.login_manager.utils import get_current_identity_id
 from globus_cli.parsing import command, endpointish_params, mutex_option_group
 from globus_cli.services.gcs import CustomGCSClient
 from globus_cli.termio import TextMode, display
@@ -41,17 +42,7 @@ from globus_cli.termio import TextMode, display
 )
 @mutex_option_group("--user-credential-id", "--local-username")
 @endpointish_params.create(name="collection")
-@click.option(
-    "--identity-id",
-    default=None,
-    help="User who should own the collection (defaults to the current user)",
-)
-@click.option(
-    "--public/--private",
-    "public",
-    default=True,
-    help="Set the collection to be public or private",
-)
+@identity_id_option
 @click.option(
     "--enable-https/--disable-https",
     "enable_https",
@@ -77,7 +68,7 @@ def collection_create_guest(
     display_name: str,
     enable_https: bool | None,
     force_encryption: bool | None,
-    identity_id: str | None,
+    identity_id: LazyCurrentIdentity,
     info_link: str | None | ExplicitNullType,
     keywords: list[str] | None,
     public: bool,
@@ -101,7 +92,7 @@ def collection_create_guest(
 
     if not user_credential_id:
         user_credential_id = _select_user_credential_id(
-            gcs_client, mapped_collection_id, local_username, identity_id
+            gcs_client, mapped_collection_id, local_username, identity_id.value
         )
 
     converted_kwargs: dict[str, t.Any] = ExplicitNullType.nullify_dict(
@@ -115,7 +106,7 @@ def collection_create_guest(
             "display_name": display_name,
             "enable_https": enable_https,
             "force_encryption": force_encryption,
-            "identity_id": identity_id,
+            "identity_id": identity_id.value,
             "info_link": info_link,
             "keywords": keywords,
             "mapped_collection_id": mapped_collection_id,
@@ -155,7 +146,7 @@ def _select_user_credential_id(
     gcs_client: CustomGCSClient,
     mapped_collection_id: uuid.UUID,
     local_username: str | None,
-    identity_id: str | None,
+    identity_id: str,
 ) -> uuid.UUID:
     """
     In the case that the user didn't specify a user credential id, see if we can select
@@ -167,9 +158,6 @@ def _select_user_credential_id(
     mapped_collection = gcs_client.get_collection(mapped_collection_id)
     storage_gateway_id = mapped_collection["storage_gateway_id"]
 
-    if not identity_id:
-        identity_id = get_current_identity_id()
-
     # Grab the list of user credentials which match the endpoint, storage gateway,
     #   identity id, and local username (if specified)
     user_creds = [
@@ -209,7 +197,11 @@ def _is_session_timeout_error(e: globus_sdk.GCSAPIError) -> bool:
     Detect session timeouts related to HA collections.
     This is a hacky workaround until we have better GARE support across the CLI.
     """
-    detail_type = getattr(e, "detail", {}).get("DATA_TYPE")
+    detail = getattr(e, "detail", {})
+    if not isinstance(detail, dict):
+        return False
+
+    detail_type = detail.get("DATA_TYPE")
     return (
         e.http_status == 403
         and isinstance(detail_type, str)