From 6eea8141e0bcb7d748a40bbed6e72f6b0d1693c1 Mon Sep 17 00:00:00 2001 From: Ben Galewsky Date: Fri, 2 Feb 2024 13:11:07 -0600 Subject: [PATCH] Remove nexus --- mdf_toolbox/auth.py | 6 +----- mdf_toolbox/version.py | 2 +- setup.py | 1 - tests/test_toolbox.py | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mdf_toolbox/auth.py b/mdf_toolbox/auth.py index 1efada4..50514dd 100644 --- a/mdf_toolbox/auth.py +++ b/mdf_toolbox/auth.py @@ -1,5 +1,4 @@ from fair_research_login import NativeClient -from globus_nexus_client import NexusClient import globus_sdk @@ -15,7 +14,6 @@ "mdf_connect_dev": "https://auth.globus.org/scopes/0e0a9538-ce45-43c1-998a-d3a7031a83f0/connect", "mdf_connect": "https://auth.globus.org/scopes/4d5f8e8b-a61d-40d8-bb58-5a3f5d1d200a/connect", "petrel": "https://auth.globus.org/scopes/56ceac29-e98a-440a-a594-b41e7a084b62/all", - "groups": "urn:globus:auth:scope:nexus.api.globus.org:groups", "dlhub": "https://auth.globus.org/scopes/81fc4156-a623-47f2-93ad-7184118226ba/auth", "funcx": "https://auth.globus.org/scopes/facd7ccc-c5f4-42aa-916b-a0e270e2c2a9/all" } @@ -25,9 +23,7 @@ KNOWN_SCOPES["search"]: globus_sdk.SearchClient, "search": globus_sdk.SearchClient, KNOWN_SCOPES["search_ingest"]: globus_sdk.SearchClient, - "search_ingest": globus_sdk.SearchClient, - KNOWN_SCOPES["groups"]: NexusClient, - "groups": NexusClient + "search_ingest": globus_sdk.SearchClient } DEFAULT_APP_NAME = "UNNAMED_APP" DEFAULT_CLIENT_ID = "984464e2-90ab-433d-8145-ac0215d26c8e" diff --git a/mdf_toolbox/version.py b/mdf_toolbox/version.py index 84e0d2c..71f6bb9 100644 --- a/mdf_toolbox/version.py +++ b/mdf_toolbox/version.py @@ -1,2 +1,2 @@ # Single source of truth for package version -__version__ = "0.7.0-rc.1" +__version__ = "0.7.0-rc.2" diff --git a/setup.py b/setup.py index 005b851..99bf91a 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,6 @@ " containing utility functions and other tools."), install_requires=[ "fair-research-login>=0.2.4", - "globus_nexus_client>=0.4.1", "globus-sdk>=3.1.0", "requests>=2.26.0", "jsonschema>=4.3.0" diff --git a/tests/test_toolbox.py b/tests/test_toolbox.py index 154ec69..01f496c 100644 --- a/tests/test_toolbox.py +++ b/tests/test_toolbox.py @@ -3,7 +3,6 @@ import os import shutil -from globus_nexus_client import NexusClient import globus_sdk import mdf_toolbox import pytest @@ -31,7 +30,6 @@ def test_login(): assert isinstance(res2.get("data_mdf"), globus_sdk.RefreshTokenAuthorizer) assert isinstance(res2.get("mdf_connect"), globus_sdk.RefreshTokenAuthorizer) assert isinstance(res2.get("petrel"), globus_sdk.RefreshTokenAuthorizer) - # assert isinstance(res2.get("groups"), NexusClient) def test_confidential_login(capsys): @@ -75,7 +73,6 @@ def test_anonymous_login(capsys): res1 = mdf_toolbox.anonymous_login(["transfer", "search", "publish", "groups"]) assert isinstance(res1.get("search"), globus_sdk.SearchClient) assert isinstance(res1.get("transfer"), globus_sdk.TransferClient) - assert isinstance(res1.get("groups"), NexusClient) # Single service works res2 = mdf_toolbox.anonymous_login("search")