rucio 35.6.1__tar.gz → 35.8.0__tar.gz

{rucio-35.6.1 → rucio-35.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rucio
-Version: 35.6.1
+Version: 35.8.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -29,7 +29,7 @@ Requires-Dist: geoip2==4.8.0
 Requires-Dist: google-auth==2.32.0
 Requires-Dist: jsonschema==4.23.0
 Requires-Dist: oic==1.7.0
-Requires-Dist: paramiko==3.4.0
+Requires-Dist: paramiko==3.4.1
 Requires-Dist: prometheus-client==0.20.0
 Requires-Dist: pymemcache==4.0.0
 Requires-Dist: python-dateutil==2.9.0.post0
@@ -65,6 +65,7 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/client/uploadclient.py

@@ -674,7 +674,7 @@ class UploadClient:
                 pfn = self.client.get_signed_url(rse_settings['rse'], sign_service, 'write', pfn)
 
         # Create a name of tmp file if renaming operation is supported
-        pfn_tmp = cast(str, '%s.rucio.upload' % pfn if protocol_write.renaming else pfn)
+        pfn_tmp = cast("str", '%s.rucio.upload' % pfn if protocol_write.renaming else pfn)
         signed_read_pfn_tmp = '%s.rucio.upload' % signed_read_pfn if protocol_write.renaming else signed_read_pfn
 
         # Either DID exists or not register_after_upload

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/common/dumper/consistency.py

@@ -18,6 +18,7 @@ import os
 import re
 import subprocess
 import tempfile
+from typing import cast
 
 from rucio.common import dumper
 from rucio.common.dumper import DUMPS_CACHE_DIR, data_models, error, path_parsing
@@ -167,10 +168,10 @@ def min_value(*values):
     '''
     Minimum between the input values, ignoring None
     '''
-    values = [value for value in values if value is not None]
-    if len(values) == 0:
+    values_without_none = cast('list[str]', [value for value in values if value is not None])
+    if len(values_without_none) == 0:
         raise ValueError("Input contains 0 non-null values.")
-    return min(values)
+    return min(values_without_none)
 
 
 def split_if_not_none(value, sep=',', fields=2):

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/common/utils.py

@@ -2116,7 +2116,7 @@ def check_policy_package_version(package: str) -> None:
     components = 2 if version_string().startswith("1.") else 1
     current_version = ".".join(version_string().split(".")[:components])
     if current_version not in supported_version:
-        raise PolicyPackageVersionError(package)
+        raise PolicyPackageVersionError(package, current_version, supported_version)
 
 
 class Availability:

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/core/did_meta_plugins/json_meta.py

@@ -100,9 +100,9 @@ class JSONDidMeta(DidMetaPlugin):
             if row_did_meta.meta:
                 if session.bind.dialect.name in ['oracle', 'sqlite']:
                     # Oracle and sqlite returns a string instead of a dict
-                    existing_meta = json_lib.loads(cast(str, row_did_meta.meta))
+                    existing_meta = json_lib.loads(cast("str", row_did_meta.meta))
                 else:
-                    existing_meta = cast(dict[str, Any], row_did_meta.meta)
+                    existing_meta = cast("dict[str, Any]", row_did_meta.meta)
 
         for key, value in metadata.items():
             existing_meta[key] = value

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/core/topology.py

@@ -358,7 +358,7 @@ class Topology(RseCollection, Generic[TN, TE]):
                                                                                  node_state_provider=_NodeStateProvider,
                                                                                  edge_state_provider=_EdgeStateProvider):
             nh_node = edge_to_next_hop.dst_node
-            edge_state = cast(_EdgeStateProvider, edge_state)
+            edge_state = cast("_EdgeStateProvider", edge_state)
             hop = {
                 'source_rse': node,
                 'dest_rse': nh_node,

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/core/transfer.py

@@ -744,7 +744,7 @@ def _create_stagein_definitions(
     """
     transfers_by_source = {
         source.rse: [
-            cast(DirectTransfer, StageinTransferImplementation(
+            cast('DirectTransfer', StageinTransferImplementation(
                 source=RequestSource(
                     rse=source.rse,
                     file_path=source.file_path,
@@ -973,7 +973,7 @@ class EnforceSourceRSEExpression(SourceFilterStrategy):
         return self._RankingContext(self, rws, allowed_source_rses)
 
     def apply(self, ctx: RequestRankingContext, source: RequestSource) -> "Optional[int | _SkipSource]":
-        ctx = cast(EnforceSourceRSEExpression._RankingContext, ctx)
+        ctx = cast('EnforceSourceRSEExpression._RankingContext', ctx)
         if ctx.allowed_source_rses is not None and source.rse.id not in ctx.allowed_source_rses:
             return SKIP_SOURCE
 
@@ -1049,7 +1049,7 @@ class PathDistance(SourceRankingStrategy):
         return PathDistance._RankingContext(self, rws, paths_for_rws)
 
     def apply(self, ctx: RequestRankingContext, source: RequestSource) -> "Optional[int | _SkipSource]":
-        path = cast(PathDistance._RankingContext, ctx).paths_for_rws.get(source.rse)
+        path = cast('PathDistance._RankingContext', ctx).paths_for_rws.get(source.rse)
         if not path:
             return SKIP_SOURCE
         return path[0].src.distance
@@ -1057,7 +1057,7 @@ class PathDistance(SourceRankingStrategy):
 
 class PreferSingleHop(PathDistance):
     def apply(self, ctx: RequestRankingContext, source: RequestSource) -> "Optional[int | _SkipSource]":
-        path = cast(PathDistance._RankingContext, ctx).paths_for_rws.get(source.rse)
+        path = cast('PathDistance._RankingContext', ctx).paths_for_rws.get(source.rse)
         if not path:
             return SKIP_SOURCE
         return int(len(path) > 1)
@@ -1097,7 +1097,7 @@ class FailureRate(SourceRankingStrategy):
             self.source_stats.setdefault(stat['src_rse_id'], self._FailureRateStat()).incorporate_stat(stat)
 
     def apply(self, ctx: RequestRankingContext, source: RequestSource) -> "Optional[int | _SkipSource]":
-        failure_rate = cast(FailureRate, ctx.strategy).source_stats.get(source.rse.id, self._FailureRateStat()).get_failure_rate()
+        failure_rate = cast('FailureRate', ctx.strategy).source_stats.get(source.rse.id, self._FailureRateStat()).get_failure_rate()
         return failure_rate
 
 
@@ -1105,7 +1105,7 @@ class SkipSchemeMissmatch(PathDistance):
     filter_only = True
 
     def apply(self, ctx: RequestRankingContext, source: RequestSource) -> "Optional[int | _SkipSource]":
-        path = cast(PathDistance._RankingContext, ctx).paths_for_rws.get(source.rse)
+        path = cast('PathDistance._RankingContext', ctx).paths_for_rws.get(source.rse)
         # path == None means that there is no path;
         # path == [] means that a path exists (according to distances) but cannot be used (scheme mismatch)
         if path is not None and not path:
@@ -1117,7 +1117,7 @@ class SkipIntermediateTape(PathDistance):
 
     def apply(self, ctx: RequestRankingContext, source: RequestSource) -> "Optional[int | _SkipSource]":
         # Discard multihop transfers which contain a tape source as an intermediate hop
-        path = cast(PathDistance._RankingContext, ctx).paths_for_rws.get(source.rse)
+        path = cast('PathDistance._RankingContext', ctx).paths_for_rws.get(source.rse)
         if path and any(transfer.src.rse.is_tape_or_staging_required() for transfer in path[1:]):
             return SKIP_SOURCE
 

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/transfertool/bittorrent_driver_qbittorrent.py

@@ -112,7 +112,7 @@ class QBittorrentDriver(BittorrentDriver):
 
     def listen_addr(self) -> tuple[str, int]:
         preferences = self.client.app_preferences()
-        port = cast(int, preferences['listen_port'])
+        port = cast('int', preferences['listen_port'])
         ip = resolve_ip(urlparse(self.client.host).hostname or self.client.host)
         return ip, port
 

{rucio-35.6.1 → rucio-35.8.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '35.6.1',
+    'version': '35.8.0',
     'branch_nick': 'release-35-LTS',
-    'revision_id': 'da061cd8b9e3955a4196b81dc6c0a4b1202bbe20',
-    'revno': 13193
+    'revision_id': '8a304950325b8afa9499d3acccb176ef7f93fd07',
+    'revno': 13205
 }

{rucio-35.6.1 → rucio-35.8.0}/requirements/requirements.server.txt

@@ -45,7 +45,7 @@ charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via flask
-cryptography==42.0.8
+cryptography==43.0.1
     # via
     #   globus-sdk
     #   oic
@@ -134,7 +134,7 @@ oic==1.7.0
     # via -r requirements.server.in
 packaging==24.1
     # via qbittorrent-api
-paramiko==3.4.0
+paramiko==3.4.1
     # via -r requirements.server.in
 pbr==6.0.0
     # via stevedore

{rucio-35.6.1 → rucio-35.8.0}/setup.cfg

@@ -3,7 +3,7 @@ verbose = 1
 force-manifest = 1
 
 [metadata]
-description-file = 
+description_file = 
 	README.md
 
 [egg_info]

{rucio-35.6.1 → rucio-35.8.0}/setup.py

@@ -19,7 +19,7 @@ import sys
 
 from setuptools import find_packages, setup
 
-if sys.version_info < (3, 9):
+if sys.version_info < (3, 9): # noqa: UP036 (pending https://github.com/rucio/rucio/issues/6971)
     print('ERROR: Rucio Server requires at least Python 3.9 to run.')
     sys.exit(1)
 

{rucio-35.6.1 → rucio-35.8.0}/tests/test_conveyor.py

@@ -1251,7 +1251,7 @@ def test_overwrite_hops(overwrite_on_tape_topology, caches_mock, did_factory, fi
     else:
         # FTS only recently introduced the overwrite_hops parameter. It will be ignored on old
         # fts versions and the first hop will fail with the  file exists error
-        # TODO: remove this else after FTS 3.12 release and after updating rucio/fts container with the new release
+        # TODO: remove this else after FTS 3.12 release and after updating rucio/test-fts container with the new release
         request = __wait_for_state_transition(dst_rse_id=rse2_id, **did1)
         assert request['state'] == RequestState.FAILED
         assert 'Destination file exists and overwrite is not enabled' in request['err_msg']