rucio 36.3.0__tar.gz → 36.4.0__tar.gz

{rucio-36.3.0 → rucio-36.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rucio
-Version: 36.3.0
+Version: 36.4.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-36.3.0 → rucio-36.4.0}/bin/rucio

@@ -90,29 +90,33 @@ def map_legacy_command() -> Optional[list[str]]:
             "touch": ["did", "update", "--touch"],
             "add-lifetime-exception": ["lifetime-exception", "add"],
         }
-        try:
-            new_command = command_map[command]
-        except KeyError:
-            pass
+        new_command = command_map.get(command)
 
     return new_command
 
 
 if __name__ == "__main__":
-    commands = ("-h", "--help", "--version", "account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
-    logger = setup_logger(module_name=__name__)
-    first_command = _get_first_command(sys.argv[1:])
+    commands = ("account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
 
-    is_legacy = '--legacy' in sys.argv
+    parser = argparse.ArgumentParser(add_help=False)
+    # Check for legacy flag
+    parser.add_argument("--legacy", action="store_true")
+    # Check for commands in the new command list
+    parser.add_argument("-h", "--help", action="store_true")
+    parser.add_argument("--version", action="store_true")
 
-    if (first_command in commands) and not is_legacy:
-        main()
+    args, _ = parser.parse_known_args()
 
-    elif is_legacy:
+    logger = setup_logger(module_name=__name__)
+
+    if args.legacy:
         make_warning(logger)
         sys.argv.pop(sys.argv.index('--legacy'))
         main_legacy()
 
+    elif (any(arg in commands for arg in sys.argv)) or args.help or args.version:
+        main()
+
     else:
         make_warning(logger)
         try:

{rucio-36.3.0 → rucio-36.4.0}/lib/rucio/common/config.py

@@ -547,12 +547,12 @@ def config_get_list(
         section: str,
         option: str,
         *,
-        default: list[str] = ...,
+        default: _T = ...,
         check_config_table: bool = ...,
         session: "Optional[Session]" = ...,
         use_cache: bool = ...,
         expiration_time: int = ...,
-) -> list[str]:
+) -> Union[list[str], _T]:
     ...
 
 

{rucio-36.3.0 → rucio-36.4.0}/lib/rucio/rse/protocols/gfal.py

@@ -186,6 +186,7 @@ class Default(protocol.RSEProtocol):
         self.__ctx.set_opt_string_list("SRM PLUGIN", "TURL_PROTOCOLS", ["gsiftp", "rfio", "gsidcap", "dcap", "kdcap"])
         self.__ctx.set_opt_string("XROOTD PLUGIN", "XRD.WANTPROT", "gsi,unix")
         self.__ctx.set_opt_boolean("XROOTD PLUGIN", "NORMALIZE_PATH", False)
+        self.__ctx.set_opt_boolean("HTTP PLUGIN", "RETRIEVE_BEARER_TOKEN", False)
         auth_configured = False
         if self.auth_token:
             self.__ctx.set_opt_string("BEARER", "TOKEN", self.auth_token)
@@ -488,12 +489,12 @@ class Default(protocol.RSEProtocol):
 
         try:
             for path in paths:
-                if self.__gfal2_exist(path) == 0:
-                    ret = ctx.unlink(str(path))
-                    if ret:
-                        return ret
-                else:
-                    raise exception.SourceNotFound
+                # GFAL does a PROPFIND request before DELETE when the scheme is
+                # davs://, which is wasteful.
+                path = re.sub('^davs://', 'https://', str(path))
+                ret = ctx.unlink(path)
+                if ret:
+                    return ret
             return ret
         except gfal2.GError as error:  # pylint: disable=no-member
             if error.code == errno.ENOENT or 'No such file' in str(error):

{rucio-36.3.0 → rucio-36.4.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '36.3.0',
+    'version': '36.4.0',
     'branch_nick': 'release-36',
-    'revision_id': '681dff60333b2f0b7d3f0b1eb7bf42ccc5f15053',
-    'revno': 13473
+    'revision_id': '0ad86f466615804f67f827a5d1036171396536ed',
+    'revno': 13479
 }

{rucio-36.3.0 → rucio-36.4.0}/tests/test_cli_client_structure.py

@@ -21,6 +21,22 @@ from rucio.common.utils import generate_uuid
 from rucio.tests.common import account_name_generator, execute, file_generator, rse_name_generator, scope_name_generator
 
 
+def test_main_args():
+    specify_account = "rucio --account root --auth-strategy userpass whoami"
+    exitcode, out, err = execute(specify_account)
+
+    assert exitcode == 0
+    assert "This method is being deprecated" not in err
+    assert "root" in out
+
+    legacy_arg = "rucio --legacy --account root --auth-strategy userpass whoami"
+    exitcode, out, err = execute(legacy_arg)
+
+    assert exitcode == 0
+    assert "This method is being deprecated" in err
+    assert "root" in out
+
+
 def test_account(rucio_client):
     new_account = account_name_generator()
     command = f"rucio account add --type USER --account {new_account}"