deriva 1.7.9__tar.gz → 1.7.11__tar.gz

{deriva-1.7.9/deriva.egg-info → deriva-1.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva
-Version: 1.7.9
+Version: 1.7.11
 Summary: Python APIs and CLIs (Command-Line Interfaces) for the DERIVA platform.
 Home-page: https://github.com/informatics-isi-edu/deriva-py
 Author: USC Information Sciences Institute, Informatics Systems Research Division
@@ -15,7 +15,6 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -28,7 +27,7 @@ Requires-Dist: requests
 Requires-Dist: pika
 Requires-Dist: urllib3<3,>=1.26.20
 Requires-Dist: portalocker>=1.2.1
-Requires-Dist: bdbag>=1.7.5
+Requires-Dist: bdbag>=1.8.0
 Requires-Dist: globus_sdk<4,>=3
 Requires-Dist: fair-research-login>=0.3.1
 Requires-Dist: fair-identifiers-client>=0.5.1

{deriva-1.7.9 → deriva-1.7.11}/deriva/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.9"
+__version__ = "1.7.11"
 
 from deriva.core.utils.core_utils import *
 from deriva.core.base_cli import BaseCLI, KeyValuePairArgs

{deriva-1.7.9 → deriva-1.7.11}/deriva/core/datapath.py

@@ -11,7 +11,8 @@ from requests import HTTPError
 import warnings
 from . import DEFAULT_HEADERS, ermrest_model as _erm
 
-__all__ = ['DataPathException', 'Min', 'Max', 'Sum', 'Avg', 'Cnt', 'CntD', 'Array', 'ArrayD', 'Bin']
+__all__ = ['DataPathException', 'Min', 'Max', 'Sum', 'Avg', 'Cnt', 'CntD', 'Array', 'ArrayD', 'Bin', 'All', 'Any',
+           'simple_denormalization', 'simple_denormalization_with_whole_entities']
 
 logger = logging.getLogger(__name__)
 """Logger for this module"""
@@ -1265,6 +1266,19 @@ class _ColumnWrapper (object):
 
     __eq__ = eq
 
+    def ne(self, other):
+        """Returns a 'not equal' comparison predicate.
+
+        :param other: `None` or any other literal value.
+        :return: a filter predicate object
+        """
+        if other is None:
+            return _ComparisonPredicate(self, "::null::", '').negate()
+        else:
+            return _ComparisonPredicate(self, "=", other).negate()
+
+    __ne__ = ne
+
     def lt(self, other):
         """Returns a 'less than' comparison predicate.
 
@@ -1311,8 +1325,6 @@ class _ColumnWrapper (object):
         :param other: a _string_ literal value.
         :return: a filter predicate object
         """
-        if not isinstance(other, str):
-            logger.warning("'regexp' method comparison only supports string literals.")
         return _ComparisonPredicate(self, "::regexp::", other)
 
     def ciregexp(self, other):
@@ -1321,8 +1333,6 @@ class _ColumnWrapper (object):
         :param other: a _string_ literal value.
         :return: a filter predicate object
         """
-        if not isinstance(other, str):
-            logger.warning("'ciregexp' method comparison only supports string literals.")
         return _ComparisonPredicate(self, "::ciregexp::", other)
 
     def ts(self, other):
@@ -1331,8 +1341,6 @@ class _ColumnWrapper (object):
         :param other: a _string_ literal value.
         :return: a filter predicate object
         """
-        if not isinstance(other, str):
-            logger.warning("'ts' method comparison only supports string literals.")
         return _ComparisonPredicate(self, "::ts::", other)
 
     def alias(self, name):
@@ -1395,6 +1403,16 @@ class _ColumnAlias (object):
 
     __eq__ = eq
 
+    def ne(self, other):
+        """Returns a 'not equal' comparison predicate.
+
+        :param other: `None` or any other literal value.
+        :return: a filter predicate object
+        """
+        return self._base_column.ne(other)
+
+    __ne__ = ne
+
     def lt(self, other):
         """Returns a 'less than' comparison predicate.
 
@@ -1713,7 +1731,7 @@ class _ComparisonPredicate (_Predicate):
         assert isinstance(lop, _ColumnWrapper)
         assert isinstance(rop, _ColumnWrapper) or isinstance(rop, int) or \
                isinstance(rop, float) or isinstance(rop, str) or \
-               isinstance(rop, date)
+               isinstance(rop, date) or isinstance(rop, _Quantifier)
         assert isinstance(op, str)
         self._lop = lop
         self._op = op
@@ -1739,6 +1757,9 @@ class _ComparisonPredicate (_Predicate):
         if isinstance(self._rop, _ColumnWrapper):
             # The only valid circumstance for a _ColumnWrapper rop is in a link 'on' predicate for simple key/fkey joins
             return "(%s)=(%s)" % (self._lop._instancename, self._rop._fqname)
+        elif isinstance(self._rop, _Quantifier):
+            # Quantifiers can be trusted to properly urlquote their literals
+            return "%s%s%s" % (self._lop._instancename, self._op, str(self._rop))
         else:
             # All other comparisons are serialized per the usual form
             return "%s%s%s" % (self._lop._instancename, self._op, urlquote(str(self._rop)))
@@ -1810,6 +1831,34 @@ class _NegationPredicate (_Predicate):
         return "!(%s)" % self._child
 
 
+class _Quantifier (object):
+    """Base class of quantifiers."""
+    def __init__(self, quantifier_name, *args):
+        """Initializes the quantifier object.
+
+        :param quantifier_name: name of the quantifier per ERMrest specification.
+        :param args: arguments of the quantifier per ERMrest specification.
+        """
+        super(_Quantifier, self).__init__()
+        self._quantifier_name = quantifier_name
+        self._args = args
+
+    def __str__(self):
+        return "%s(%s)" % (self._quantifier_name, ','.join([urlquote(str(arg)) for arg in self._args]))
+
+
+class All (_Quantifier):
+    """Universal quantifier."""
+    def __init__(self, *args):
+        super(All, self).__init__('all', *args)
+
+
+class Any (_Quantifier):
+    """Existential quantifier."""
+    def __init__(self, *args):
+        super(Any, self).__init__('any', *args)
+
+
 class AggregateFunction (object):
     """Base class of all aggregate functions."""
     def __init__(self, fn_name, arg):

deriva-1.7.11/deriva/core/utils/credenza_auth_utils.py

@@ -0,0 +1,299 @@
+import sys
+import json
+import logging
+import traceback
+from pprint import pprint
+from requests.exceptions import HTTPError, ConnectionError
+from bdbag.fetch.auth import keychain as bdbkc
+from deriva.core import DEFAULT_CREDENTIAL_FILE, read_credential, write_credential, format_exception, BaseCLI, \
+    get_new_requests_session, urlparse, urljoin
+from deriva.core.utils import eprint
+
+logger = logging.getLogger(__name__)
+
+
+def host_to_url(host, path="/", protocol="https"):
+    if not host:
+        return None
+    upr = urlparse(host)
+    if upr.scheme and upr.netloc:
+        url = urljoin(host, path)
+    else:
+        url = "%s://%s%s" % (protocol, host, path if not host.endswith("/") else "")
+    return url.lower()
+
+class UsageException(ValueError):
+    """Usage exception.
+    """
+    def __init__(self, message):
+        """Initializes the exception.
+        """
+        super(UsageException, self).__init__(message)
+
+class CredenzaAuthUtilCLI(BaseCLI):
+    """CredenzaAuthUtil Command-line Interface.
+    """
+    def __init__(self, *args, **kwargs):
+        super(CredenzaAuthUtilCLI, self).__init__(*args, **kwargs)
+        self.remove_options(['--token', '--oauth2-token'])
+        self.parser.add_argument("--pretty", "-p", action="store_true",
+                                 help="Pretty-print all result output.")
+        self.credentials = None
+
+        # init subparsers and corresponding functions
+        self.subparsers = self.parser.add_subparsers(title='sub-commands', dest='subcmd')
+        self.login_init()
+        self.logout_init()
+        self.get_session_init()
+        self.put_session_init()
+
+    @staticmethod
+    def update_bdbag_keychain(token=None, host=None, keychain_file=None, allow_redirects=False, delete=False):
+        if (token is None) or (host is None):
+            return
+        keychain_file = keychain_file or bdbkc.DEFAULT_KEYCHAIN_FILE
+        entry = {
+            "uri": host_to_url(host),
+            "auth_type": "bearer-token",
+            "auth_params": {
+                "token": token,
+                "allow_redirects_with_token": True if allow_redirects else False
+            }
+        }
+        bdbkc.update_keychain(entry, keychain_file=keychain_file, delete=delete)
+
+    def load_credential(self, host, credential_file=None):
+        if not self.credentials:
+            self.credentials = read_credential(credential_file or DEFAULT_CREDENTIAL_FILE, create_default=True)
+        credential = self.credentials.get(host, self.credentials.get(host.lower()))
+        if not credential:
+            return None
+        return credential.get("bearer-token")
+
+    def save_credential(self, host, credential_file=None, credential=None):
+        if not self.credentials:
+            self.credentials = read_credential(credential_file or DEFAULT_CREDENTIAL_FILE, create_default=True)
+
+        if credential is not None:
+            self.credentials[host] = {"bearer-token": credential}
+        else:
+            self.credentials.pop(host, None)
+
+        write_credential(credential_file or DEFAULT_CREDENTIAL_FILE, self.credentials)
+
+    def get_session(self, args, check_only=False):
+        credential = self.load_credential(args.host, args.credential_file)
+        if not credential:
+            return None if check_only else "Credential not found. Login required."
+
+        url = host_to_url(args.host, "/authn/session")
+        session = get_new_requests_session(url)
+        session.headers.update({"Authorization": f"Bearer {credential}"})
+        response = session.get(url)
+
+        if response.status_code == 200:
+            return response.json()
+        elif response.status_code == 404:
+            return None if check_only else f"No valid session found for host '{args.host}'."
+        else:
+            response.raise_for_status()
+            return None
+
+    def put_session(self, args):
+        credential = self.load_credential(args.host, args.credential_file)
+        if not credential:
+            return "Credential not found. Login required."
+
+        path = "/authn/session"
+        if args.refresh_upstream:
+            path += "?refresh_upstream=true"
+        url = host_to_url(args.host, path)
+        session = get_new_requests_session(url)
+        session.headers.update({"Authorization": f"Bearer {credential}"})
+        response = session.put(url)
+
+        if response.status_code == 200:
+            return response.json()
+        elif response.status_code == 404:
+            return f"No valid session found for host '{args.host}'."
+        else:
+            response.raise_for_status()
+            return None
+
+    def login(self, args):
+
+        if not sys.stdin.isatty():
+            raise RuntimeError("Interactive TTY required for device login.")
+
+        if not args.force:
+            resp = self.get_session(args, check_only=True)
+            if resp:
+                return f"You are already logged in to host '{args.host}'"
+
+        path = "/authn/device/start"
+        if args.refresh:
+            path += "?refresh=true"
+        url = host_to_url(args.host, path)
+        session = get_new_requests_session(url)
+        response = session.post(url)
+        response.raise_for_status()
+        body = response.json()
+        verification_url = body["verification_uri"]
+
+        login_prompt = f"""
+
+    Device login initiated to {args.host}.
+    
+    1. Please visit {verification_url} in a browser to complete authentication.
+    2. After that, return here and enter "y" or "yes" at the prompt below to proceed.
+
+        """
+        sys.stdout.write(login_prompt)
+        sys.stdout.flush()
+        try:
+            while True:
+                sys.stdout.write("\nProceed? (y/N): ")
+                sys.stdout.flush()
+                response = sys.stdin.readline()
+
+                ans = response.strip().lower()
+                if ans in {"y", "yes"}:
+                    break
+                elif ans in {"n", "no", ""}:  # default is No on empty/enter
+                    return f"Login cancelled for '{args.host}'."
+        except KeyboardInterrupt:
+            sys.stdout.write("\nCancelled by user (Ctrl-C).\n")
+            return f"Login cancelled for '{args.host}'."
+
+        token_response = session.post(
+            f"https://{args.host}/authn/device/token",
+            json={"device_code": body["device_code"]}
+        )
+        token_response.raise_for_status()
+        body = token_response.json()
+        token = body["access_token"]
+        self.save_credential(args.host, args.credential_file, token)
+        if not args.no_bdbag_keychain:
+            self.update_bdbag_keychain(host=args.host,
+                                       token=token,
+                                       keychain_file=args.bdbag_keychain_file or bdbkc.DEFAULT_KEYCHAIN_FILE)
+        token_display = f"Access token: {token}" if args.show_token else ""
+        return f"You have been successfully logged in to host '{args.host}'. {token_display}"
+
+    def logout(self, args):
+        credential = self.load_credential(args.host, args.credential_file)
+        if not credential:
+            return "Credential not found. Not logged in."
+
+        url = host_to_url(args.host, "/authn/device/logout")
+        session = get_new_requests_session(url)
+        session.headers.update({"Authorization": f"Bearer {credential}"})
+        response = session.post(url)
+        response.raise_for_status()
+
+        self.save_credential(args.host, args.credential_file)
+        if not args.no_bdbag_keychain:
+            self.update_bdbag_keychain(host=args.host,
+                                       token=credential,
+                                       delete=True,
+                                       keychain_file=args.bdbag_keychain_file or bdbkc.DEFAULT_KEYCHAIN_FILE)
+
+        return f"You have been successfully logged out of host '{args.host}'."
+
+    def login_init(self):
+        parser = self.subparsers.add_parser('login',
+                                            help="Login with Globus Auth and get OAuth tokens for resource access.")
+
+        parser.add_argument("--no-bdbag-keychain", action="store_true",
+                            help="Do not update the bdbag keychain file with result access tokens. Default false.")
+        parser.add_argument('--bdbag-keychain-file', metavar='<file>',
+                            help="Non-default path to a bdbag keychain file.")
+        parser.add_argument("--refresh", action="store_true",
+                            help="Allow the session manager to automatically refresh access tokens on the user's behalf "
+                                 "until either the refresh token expires or the user logs out.")
+        parser.add_argument("--force", action="store_true",
+                            help="Force a login flow even if the current access token is valid.")
+        parser.add_argument("--show-token", action="store_true",
+                            help="Display the token from the authorization response.")
+        parser.set_defaults(func=self.login)
+
+    def logout_init(self):
+        parser = self.subparsers.add_parser("logout", help="Logout and revoke all access and refresh tokens.")
+        parser.add_argument("--no-bdbag-keychain", action="store_true",
+                            help="Do not update the bdbag keychain file by removing access tokens on logout. Default false.")
+        parser.add_argument('--bdbag-keychain-file', metavar='<file>',
+                            help="Non-default path to a bdbag keychain file.")
+        parser.set_defaults(func=self.logout)
+
+    def get_session_init(self):
+        parser = self.subparsers.add_parser("get-session",
+                                            help="Retrieve information about the currently logged-in user.")
+        parser.set_defaults(func=self.get_session)
+
+    def put_session_init(self):
+        parser = self.subparsers.add_parser("put-session",
+                                            help="Extend the current logged-in user's session.")
+        parser.add_argument("--refresh-upstream", action="store_true",
+                            help="Attempt to refresh access tokens, other dependent tokens, and claims from the "
+                                 "upstream identity provider.")
+        parser.set_defaults(func=self.put_session)
+
+    def main(self):
+        args = self.parse_cli()
+
+        def _cmd_error_message(emsg):
+            return "{prog} {subcmd}: {msg}".format(
+                prog=self.parser.prog, subcmd=args.subcmd, msg=emsg)
+
+        try:
+            if not hasattr(args, 'func'):
+                self.parser.print_usage()
+                return 2
+
+            if args.subcmd == "login" or args.subcmd == "logout" or args.subcmd == "session":
+                pass
+            else:
+                pass
+
+            response = args.func(args)
+            if args.pretty:
+                if isinstance(response, dict) or isinstance(response, list):
+                    try:
+                        print(json.dumps(response, indent=2))
+                        return 0
+                    except:
+                        pprint(response)
+                        return 0
+                elif not isinstance(response, str):
+                    pprint(response)
+                    return 0
+            print(response)
+            return 0
+
+        except UsageException as e:
+            eprint("{prog} {subcmd}: {msg}".format(prog=self.parser.prog, subcmd=args.subcmd, msg=e))
+        except ConnectionError as e:
+            eprint("{prog}: Connection error occurred".format(prog=self.parser.prog))
+        except HTTPError as e:
+            if 401 == e.response.status_code:
+                msg = 'Authentication required: %s' % format_exception(e)
+            elif 403 == e.response.status_code:
+                msg = 'Permission denied: %s' % format_exception(e)
+            else:
+                msg = e
+            eprint(_cmd_error_message(msg))
+        except RuntimeError as e:
+            logging.debug(format_exception(e))
+            eprint('An unexpected runtime error occurred')
+        except:
+            eprint('An unexpected error occurred')
+            traceback.print_exc()
+        return 1
+
+def main():
+    desc = "Credenza Auth Utilities"
+    info = "For more information see: https://github.com/informatics-isi-edu/deriva-py"
+    return CredenzaAuthUtilCLI(desc, info).main()
+
+if __name__ == '__main__':
+    sys.exit(main())

{deriva-1.7.9 → deriva-1.7.11/deriva.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva
-Version: 1.7.9
+Version: 1.7.11
 Summary: Python APIs and CLIs (Command-Line Interfaces) for the DERIVA platform.
 Home-page: https://github.com/informatics-isi-edu/deriva-py
 Author: USC Information Sciences Institute, Informatics Systems Research Division
@@ -15,7 +15,6 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -28,7 +27,7 @@ Requires-Dist: requests
 Requires-Dist: pika
 Requires-Dist: urllib3<3,>=1.26.20
 Requires-Dist: portalocker>=1.2.1
-Requires-Dist: bdbag>=1.7.5
+Requires-Dist: bdbag>=1.8.0
 Requires-Dist: globus_sdk<4,>=3
 Requires-Dist: fair-research-login>=0.3.1
 Requires-Dist: fair-identifiers-client>=0.5.1

{deriva-1.7.9 → deriva-1.7.11}/deriva.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
-.gitignore
-CHANGELOG.md
 LICENSE
 README.md
-requirements_dev.txt
+pyproject.toml
 setup.cfg
 setup.py
 deriva/__init__.py
@@ -58,12 +56,12 @@ deriva/core/schemas/visible_foreign_keys.schema.json
 deriva/core/tests/__init__.py
 deriva/core/utils/__init__.py
 deriva/core/utils/core_utils.py
+deriva/core/utils/credenza_auth_utils.py
 deriva/core/utils/globus_auth_utils.py
 deriva/core/utils/hash_utils.py
 deriva/core/utils/mime_utils.py
 deriva/core/utils/version_utils.py
 deriva/core/utils/webauthn_utils.py
-deriva/seo/README.md
 deriva/seo/__init__.py
 deriva/seo/sitemap_builder.py
 deriva/seo/sitemap_cli.py
@@ -95,24 +93,6 @@ deriva/transfer/download/processors/transform/format_transform_processor.py
 deriva/transfer/download/processors/transform/geo_transform_processor.py
 deriva/transfer/download/processors/transform/string_transform_processor.py
 deriva/transfer/download/tests/__init__.py
-deriva/transfer/download/tests/test1.json
-deriva/transfer/download/tests/test10.json
-deriva/transfer/download/tests/test11.json
-deriva/transfer/download/tests/test12.json
-deriva/transfer/download/tests/test13.json
-deriva/transfer/download/tests/test14.json
-deriva/transfer/download/tests/test15.json
-deriva/transfer/download/tests/test16.json
-deriva/transfer/download/tests/test19.json
-deriva/transfer/download/tests/test2.json
-deriva/transfer/download/tests/test20.json
-deriva/transfer/download/tests/test3.json
-deriva/transfer/download/tests/test4.json
-deriva/transfer/download/tests/test5.json
-deriva/transfer/download/tests/test6.json
-deriva/transfer/download/tests/test7.json
-deriva/transfer/download/tests/test8.json
-deriva/transfer/download/tests/test9.json
 deriva/transfer/restore/__init__.py
 deriva/transfer/restore/__main__.py
 deriva/transfer/restore/deriva_restore.py
@@ -129,48 +109,6 @@ deriva/transfer/upload/processors/metadata_update_processor.py
 deriva/transfer/upload/processors/rename_processor.py
 deriva/transfer/upload/tests/__init__.py
 deriva/utils/__init__.py
-docs/BUILD.md
-docs/Makefile
-docs/README.md
-docs/conf.py
-docs/derivapy-catalog-snapshot.ipynb
-docs/derivapy-catalog.ipynb
-docs/derivapy-datapath-example-1.ipynb
-docs/derivapy-datapath-example-2.ipynb
-docs/derivapy-datapath-example-3.ipynb
-docs/derivapy-datapath-example-4.ipynb
-docs/derivapy-datapath-update.ipynb
-docs/get-started.ipynb
-docs/index.rst
-docs/install.md
-docs/make.bat
-docs/project-tutorial.md
-docs/using-r.md
-docs/_static/README.txt
-docs/api/deriva.config.rst
-docs/api/deriva.core.rst
-docs/api/deriva.core.utils.rst
-docs/api/deriva.rst
-docs/api/deriva.seo.rst
-docs/api/deriva.transfer.backup.rst
-docs/api/deriva.transfer.download.processors.postprocess.rst
-docs/api/deriva.transfer.download.processors.query.rst
-docs/api/deriva.transfer.download.processors.rst
-docs/api/deriva.transfer.download.processors.transform.rst
-docs/api/deriva.transfer.download.rst
-docs/api/deriva.transfer.restore.rst
-docs/api/deriva.transfer.rst
-docs/api/deriva.transfer.upload.rst
-docs/cli/commands.md
-docs/cli/deriva-acl-config.md
-docs/cli/deriva-annotation-config.md
-docs/cli/deriva-annotation-validate.md
-docs/cli/deriva-backup-cli.md
-docs/cli/deriva-download-cli.md
-docs/cli/deriva-hatrac-cli.md
-docs/cli/deriva-restore-cli.md
-docs/cli/deriva-sitemap-cli.md
-tests/__init__.py
 tests/deriva/__init__.py
 tests/deriva/core/__init__.py
 tests/deriva/core/test_datapath.py

{deriva-1.7.9 → deriva-1.7.11}/deriva.egg-info/entry_points.txt

@@ -6,6 +6,7 @@ deriva-annotation-rollback = deriva.config.rollback_annotation:main
 deriva-annotation-validate = deriva.config.annotation_validate:main
 deriva-backup-cli = deriva.transfer.backup.__main__:main
 deriva-catalog-cli = deriva.core.catalog_cli:main
+deriva-credenza-auth-utils = deriva.core.utils.credenza_auth_utils:main
 deriva-download-cli = deriva.transfer.download.__main__:main
 deriva-export-cli = deriva.transfer.download.deriva_export:main
 deriva-globus-auth-utils = deriva.core.utils.globus_auth_utils:main

{deriva-1.7.9 → deriva-1.7.11}/deriva.egg-info/requires.txt

@@ -3,7 +3,7 @@ requests
 pika
 urllib3<3,>=1.26.20
 portalocker>=1.2.1
-bdbag>=1.7.5
+bdbag>=1.8.0
 globus_sdk<4,>=3
 fair-research-login>=0.3.1
 fair-identifiers-client>=0.5.1

deriva-1.7.11/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=68", "wheel"]
+build-backend = "setuptools.build_meta"

{deriva-1.7.9 → deriva-1.7.11}/setup.py

@@ -58,7 +58,8 @@ setup(
             'deriva-sitemap-cli = deriva.seo.sitemap_cli:main',
             'deriva-backup-cli = deriva.transfer.backup.__main__:main',
             'deriva-restore-cli = deriva.transfer.restore.__main__:main',
-            'deriva-globus-auth-utils = deriva.core.utils.globus_auth_utils:main'
+            'deriva-globus-auth-utils = deriva.core.utils.globus_auth_utils:main',
+            'deriva-credenza-auth-utils = deriva.core.utils.credenza_auth_utils:main'
         ]
     },
     install_requires=[
@@ -67,7 +68,7 @@ setup(
         'pika',
         'urllib3>=1.26.20,<3',
         'portalocker>=1.2.1',
-        'bdbag>=1.7.5',
+        'bdbag>=1.8.0',
         'globus_sdk>=3,<4',
         'fair-research-login>=0.3.1',
         'fair-identifiers-client>=0.5.1',
@@ -82,7 +83,6 @@ setup(
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',