globus-cli 3.23.0__tar.gz → 3.25.0__tar.gz

{globus-cli-3.23.0/src/globus_cli.egg-info → globus-cli-3.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: globus-cli
-Version: 3.23.0
+Version: 3.25.0
 Summary: Globus CLI
 Author-email: Stephen Rosen <sirosen@globus.org>
 Project-URL: homepage, https://github.com/globus/globus-cli
@@ -10,16 +10,15 @@ 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.34.0
+Requires-Dist: globus-sdk==3.37.0
 Requires-Dist: click<9,>=8.1.4
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: packaging>=17.0
@@ -29,11 +28,11 @@ Requires-Dist: cryptography>=3.3.1
 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: 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.23.3; extra == "test"
-Requires-Dist: ruamel.yaml==0.17.32; extra == "test"
+Requires-Dist: responses==0.25.0; extra == "test"
+Requires-Dist: ruamel.yaml==0.18.6; extra == "test"
 Requires-Dist: setuptools; python_version >= "3.12" and extra == "test"
 
 .. image:: https://github.com/globus/globus-cli/workflows/build/badge.svg?event=push

{globus-cli-3.23.0 → globus-cli-3.25.0}/pyproject.toml

@@ -20,16 +20,15 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: POSIX",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.7",
     "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.7"
+requires-python = ">=3.8"
 dependencies = [
-    "globus-sdk==3.34.0",
+    "globus-sdk==3.37.0",
     "click>=8.1.4,<9",
     "jmespath==1.0.1",
     "packaging>=17.0",
@@ -48,12 +47,12 @@ homepage = "https://github.com/globus/globus-cli"
 test = [
     "coverage>=7",
     "pytest>=7",
-    "pytest-xdist<3",
-    "pytest-timeout<2",
+    "pytest-xdist<4",
+    "pytest-timeout<3",
     "click-type-test==0.0.7;python_version>='3.10'",
-    "responses==0.23.3",
+    "responses==0.25.0",
     # loading test fixture data
-    "ruamel.yaml==0.17.32",
+    "ruamel.yaml==0.18.6",
     # Python 3.12 needs setuptools.
     "setuptools;python_version>='3.12'",
 ]

{globus-cli-3.23.0 → globus-cli-3.25.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.23.0 → globus-cli-3.25.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,

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/collection/list.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 import typing as t
 import uuid
 
@@ -10,11 +9,6 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import Field, TextMode, display, formatters
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 class ChoiceSlugified(click.Choice):
     """
@@ -23,7 +17,7 @@ class ChoiceSlugified(click.Choice):
     """
 
     def get_type_annotation(self, param: click.Parameter) -> type:
-        return t.cast(type, Literal[tuple(self._slugify(c) for c in self.choices)])
+        return t.cast(type, t.Literal[tuple(self._slugify(c) for c in self.choices)])
 
     def convert(
         self, value: t.Any, param: click.Parameter | None, ctx: click.Context | None
@@ -95,7 +89,7 @@ def collection_list(
     endpoint_id: uuid.UUID,
     include_private_policies: bool,
     filters: tuple[
-        Literal[
+        t.Literal[
             "mapped_collections", "guest_collections", "managed_by_me", "created_by_me"
         ],
         ...,

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/activate.py

@@ -37,7 +37,7 @@ from globus_cli.termio import TextMode, display
 @click.option(
     "--myproxy-username",
     "-U",
-    help=("Give a username to use with --myproxy"),
+    help="Give a username to use with --myproxy",
 )
 @click.option("--myproxy-password", "-P", hidden=True)
 @click.option(
@@ -171,9 +171,9 @@ def endpoint_activate(
 
     # check if endpoint is already activated unless --force
     if not force:
-        res: (
-            dict[str, str] | globus_sdk.GlobusHTTPResponse
-        ) = transfer_client.endpoint_autoactivate(endpoint_id, if_expires_in=60)
+        res: dict[str, str] | globus_sdk.GlobusHTTPResponse = (
+            transfer_client.endpoint_autoactivate(endpoint_id, if_expires_in=60)
+        )
 
         if "AlreadyActivated" == res["code"]:
             display(

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/create.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 import uuid
 
 from globus_cli.constants import ExplicitNullType
@@ -17,11 +17,6 @@ from globus_cli.termio import Field, TextMode, display, print_command_hint
 
 from ._common import validate_endpoint_create_and_update_params
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 COMMON_FIELDS = [Field("Message", "message"), Field("Endpoint ID", "id")]
 
 GCP_FIELDS = [Field("Setup Key", "globus_connect_setup_key")]
@@ -81,7 +76,7 @@ def endpoint_create(
     max_parallelism: int | None,
     myproxy_dn: str | None,
     myproxy_server: str | None,
-    network_use: Literal["normal", "minimal", "aggressive", "custom"] | None,
+    network_use: t.Literal["normal", "minimal", "aggressive", "custom"] | None,
     oauth_server: str | None,
     organization: str | None | ExplicitNullType,
     preferred_concurrency: int | None,
@@ -122,9 +117,7 @@ For GCS, use the globus-connect-server CLI from your Endpoint."""
     endpoint_type = (
         EntityType.GCP_MAPPED
         if personal
-        else EntityType.GCSV4_HOST
-        if server
-        else EntityType.GCSV4_SHARE
+        else EntityType.GCSV4_HOST if server else EntityType.GCSV4_SHARE
     )
 
     # build options into a dict for kwarg-expansion

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/permission/create.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 import uuid
 
 import click
@@ -9,11 +9,6 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import ENDPOINT_PLUS_REQPATH, command, security_principal_opts
 from globus_cli.termio import Field, TextMode, display
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 @command(
     "create",
@@ -60,7 +55,7 @@ def create_command(
     login_manager: LoginManager,
     *,
     principal: tuple[str, str],
-    permissions: Literal["r", "rw"],
+    permissions: t.Literal["r", "rw"],
     endpoint_plus_path: tuple[uuid.UUID, str | None],
     notify_email: str | None,
     notify_message: str | None,

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/permission/update.py

@@ -1,4 +1,4 @@
-import sys
+import typing as t
 import uuid
 
 import click
@@ -7,11 +7,6 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import TextMode, display
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 @command(
     "update",
@@ -38,7 +33,7 @@ $ globus endpoint permission update $ep_id $rule_id --permissions r
 def update_command(
     login_manager: LoginManager,
     *,
-    permissions: Literal["r", "rw"],
+    permissions: t.Literal["r", "rw"],
     rule_id: str,
     endpoint_id: uuid.UUID,
 ) -> None:

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/role/create.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 import uuid
 
 import click
@@ -9,11 +9,6 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg, security_principal_opts
 from globus_cli.termio import display
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 @command(
     "create",
@@ -47,7 +42,7 @@ $ globus endpoint role create 'aa752cea-8222-5bc8-acd9-555b090c0ccb' \
 def role_create(
     login_manager: LoginManager,
     *,
-    role: Literal[
+    role: t.Literal[
         "administrator", "access_manager", "activity_manager", "activity_monitor"
     ],
     principal: tuple[str, str],

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/search.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 
 import click
 from globus_sdk.paging import Paginator
@@ -10,11 +10,6 @@ from globus_cli.parsing import command
 from globus_cli.termio import display
 from globus_cli.utils import PagingWrapper
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 @command(
     "search",
@@ -81,7 +76,7 @@ def endpoint_search(
     filter_fulltext: str | None,
     limit: int,
     filter_owner_id: str | None,
-    filter_scope: Literal[
+    filter_scope: t.Literal[
         "all",
         "administered-by-me",
         "my-endpoints",

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/server/add.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 import uuid
 
 from globus_cli.login_manager import LoginManager
@@ -9,11 +9,6 @@ from globus_cli.termio import TextMode, display
 
 from ._common import server_add_opts
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 @command(
     "add",
@@ -37,7 +32,7 @@ def server_add(
     endpoint_id: uuid.UUID,
     subject: str | None,
     port: int,
-    scheme: Literal["gsiftp", "ftp"],
+    scheme: t.Literal["gsiftp", "ftp"],
     hostname: str,
     incoming_data_ports: tuple[int | None, int | None] | None,
     outgoing_data_ports: tuple[int | None, int | None] | None,

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/server/delete.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 import typing as t
 import uuid
 from textwrap import dedent
@@ -12,16 +11,11 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import TextMode, display
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 def _spec_to_matches(
     server_list: globus_sdk.IterableTransferResponse,
     server_spec: str,
-    mode: Literal["uri", "hostname", "hostname_port"],
+    mode: t.Literal["uri", "hostname", "hostname_port"],
 ) -> list[t.Mapping[str, t.Any]]:
     """
     mode is in {uri, hostname, hostname_port}
@@ -47,7 +41,7 @@ def _spec_to_matches(
     return [server_doc for server_doc in server_list if match(server_doc)]
 
 
-def _detect_mode(server: str) -> Literal["id", "uri", "hostname", "hostname_port"]:
+def _detect_mode(server: str) -> t.Literal["id", "uri", "hostname", "hostname_port"]:
     try:
         int(server)
         return "id"

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/server/list.py

@@ -38,9 +38,9 @@ def server_list(login_manager: LoginManager, *, endpoint_id: uuid.UUID) -> None:
     # raises usage error on shares for us
     endpoint_w_server_list = transfer_client.get_endpoint_w_server_list(endpoint_id)
     endpoint = endpoint_w_server_list[0]
-    server_list: (
-        str | dict[str, t.Any] | globus_sdk.GlobusHTTPResponse
-    ) = endpoint_w_server_list[1]
+    server_list: str | dict[str, t.Any] | globus_sdk.GlobusHTTPResponse = (
+        endpoint_w_server_list[1]
+    )
 
     if server_list == "S3":  # not GCS -- this is an S3 endpoint
         server_list = {"s3_url": endpoint["s3_url"]}

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/server/update.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 import uuid
 
 from globus_cli.login_manager import LoginManager
@@ -9,11 +9,6 @@ from globus_cli.termio import TextMode, display
 
 from ._common import server_id_arg, server_update_opts
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 @command(
     "update",
@@ -40,7 +35,7 @@ def server_update(
     server_id: str,
     subject: str | None,
     port: int | None,
-    scheme: Literal["gsiftp", "ftp"] | None,
+    scheme: t.Literal["gsiftp", "ftp"] | None,
     hostname: str | None,
     incoming_data_ports: tuple[int | None, int | None] | None,
     outgoing_data_ports: tuple[int | None, int | None] | None,

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/endpoint/update.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 import uuid
 
 import click
@@ -18,11 +18,6 @@ from globus_cli.termio import TextMode, display
 
 from ._common import validate_endpoint_create_and_update_params
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 
 @command("update")
 @endpoint_id_arg
@@ -58,7 +53,7 @@ def endpoint_update(
     max_parallelism: int | None,
     myproxy_dn: str | None,
     myproxy_server: str | None,
-    network_use: Literal["normal", "minimal", "aggressive", "custom"] | None,
+    network_use: t.Literal["normal", "minimal", "aggressive", "custom"] | None,
     no_default_directory: bool | None,
     oauth_server: str | None,
     organization: str | None | ExplicitNullType,

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/flows/create.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import uuid
+
 import click
 
 from globus_cli.commands.flows._common import (
@@ -36,6 +38,11 @@ ROLE_TYPES = ("flow_viewer", "flow_starter", "flow_administrator", "flow_owner")
 @starters_option
 @viewers_option
 @keywords_option
+@click.option(
+    "--subscription-id",
+    help="Set a subscription_id for the flow, marking it as subscription tier.",
+    type=click.UUID,
+)
 @LoginManager.requires_login("flows")
 def create_command(
     login_manager: LoginManager,
@@ -49,6 +56,7 @@ def create_command(
     starters: tuple[str, ...],
     viewers: tuple[str, ...],
     keywords: tuple[str, ...],
+    subscription_id: uuid.UUID | None,
 ) -> None:
     """
     Create a new flow.
@@ -98,6 +106,7 @@ def create_command(
         flow_starters=list(starters),
         flow_administrators=list(administrators),
         keywords=list(keywords),
+        subscription_id=subscription_id,
     )
 
     # Configure formatters for principals
@@ -114,6 +123,7 @@ def create_command(
         Field("Description", "description"),
         Field("Keywords", "keywords", formatter=formatters.ArrayFormatter()),
         Field("Owner", "flow_owner", formatter=principal_formatter),
+        Field("Subscription ID", "subscription_id"),
         Field("Created At", "created_at", formatter=formatters.Date),
         Field("Updated At", "updated_at", formatter=formatters.Date),
         Field(

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/flows/list.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import sys
+import typing as t
 
 import click
 from globus_sdk.paging import Paginator
@@ -10,11 +10,6 @@ from globus_cli.parsing import ColonDelimitedChoiceTuple, command
 from globus_cli.termio import Field, display, formatters
 from globus_cli.utils import PagingWrapper
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 ROLE_TYPES = ("flow_viewer", "flow_starter", "flow_administrator", "flow_owner")
 ORDER_BY_FIELDS = (
     "id",
@@ -77,19 +72,19 @@ def list_command(
     login_manager: LoginManager,
     *,
     filter_role: (
-        Literal["flow_viewer", "flow_starter", "flow_administrator", "flow_owner"]
+        t.Literal["flow_viewer", "flow_starter", "flow_administrator", "flow_owner"]
         | None
     ),
     orderby: tuple[
         tuple[
-            Literal[
+            t.Literal[
                 "id",
                 "scope_string",
                 "title",
                 "created_at",
                 "updated_at",
             ],
-            Literal["ASC", "DESC"],
+            t.Literal["ASC", "DESC"],
         ],
         ...,
     ],

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/flows/show.py

@@ -30,6 +30,7 @@ def show_command(login_manager: LoginManager, *, flow_id: uuid.UUID) -> None:
         Field("Title", "title"),
         Field("Keywords", "keywords", formatter=formatters.ArrayFormatter()),
         Field("Owner", "flow_owner", formatter=principal_formatter),
+        Field("Subscription ID", "subscription_id"),
         Field("Created At", "created_at", formatter=formatters.Date),
         Field("Updated At", "updated_at", formatter=formatters.Date),
         Field(

{globus-cli-3.23.0 → globus-cli-3.25.0}/src/globus_cli/commands/gcs/endpoint/__init__.py

@@ -4,7 +4,10 @@ from globus_cli.parsing import group
 @group(
     "endpoint",
     lazy_subcommands={
+        "role": (".role", "role_command"),
         "set-subscription-id": (".set_subscription_id", "set_subscription_id_command"),
+        "show": (".show", "show_command"),
+        "update": (".update", "update_command"),
     },
 )
 def endpoint_command() -> None: