rucio-clients 38.0.0rc1__tar.gz → 38.0.0rc3__tar.gz

{rucio_clients-38.0.0rc1 → rucio_clients-38.0.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio-clients
-Version: 38.0.0rc1
+Version: 38.0.0rc3
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio_clients-38.0.0rc1 → rucio_clients-38.0.0rc3}/lib/rucio/common/exception.py

@@ -1215,7 +1215,7 @@ class OpenDataError(RucioException):
 
     def __init__(self, *args):
         super(OpenDataError, self).__init__(*args)
-        self._message = f"Error related to open data."
+        self._message = "Error related to open data."
         self.error_code = 115
 
 
@@ -1226,7 +1226,7 @@ class OpenDataDataIdentifierNotFound(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataDataIdentifierNotFound, self).__init__(*args)
-        self._message = f"Data identifier not found in the open data catalog."
+        self._message = "Data identifier not found in the open data catalog."
         self.error_code = 116
 
 
@@ -1237,7 +1237,7 @@ class OpenDataDataIdentifierAlreadyExists(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataDataIdentifierAlreadyExists, self).__init__(*args)
-        self._message = f"Data identifier already exists in the open data catalog."
+        self._message = "Data identifier already exists in the open data catalog."
         self.error_code = 117
 
 
@@ -1248,7 +1248,7 @@ class OpenDataInvalidState(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataInvalidState, self).__init__(*args)
-        self._message = f"Open data entry is in an invalid state."
+        self._message = "Open data entry is in an invalid state."
         self.error_code = 118
 
 
@@ -1259,5 +1259,5 @@ class OpenDataInvalidStateUpdate(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataInvalidStateUpdate, self).__init__(*args)
-        self._message = f"Invalid state update attempted on open data entry."
+        self._message = "Invalid state update attempted on open data entry."
         self.error_code = 119

{rucio_clients-38.0.0rc1 → rucio_clients-38.0.0rc3}/lib/rucio/common/utils.py

@@ -399,7 +399,7 @@ class NonDeterministicPFNAlgorithms(PolicyPackageAlgorithms):
         Initialises a non-deterministic PFN construction object
         """
         super().__init__()
-        
+
         self.vo = vo
 
     def construct_non_deterministic_pfn(self, dsn: str, scope: Optional[str], filename: str, naming_convention: str) -> str:

{rucio_clients-38.0.0rc1 → rucio_clients-38.0.0rc3}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '38.0.0rc1',
+    'version': '38.0.0rc3',
     'branch_nick': 'master',
-    'revision_id': '7f986b67665c21ac40a2b32732b2f263bafd2f6c',
-    'revno': 13890
+    'revision_id': 'c4df1306d192b518b38e023e783ea998c6c0dfb5',
+    'revno': 13917
 }

{rucio_clients-38.0.0rc1 → rucio_clients-38.0.0rc3}/setuputil.py

@@ -93,6 +93,7 @@ server_requirements_table = {
         'mongo': ['pymongo<=4.11.2'],
         'elastic': ['elasticsearch<=8.15.1'],
         'postgresql': [
+            'psycopg<=3.2.3',
             'psycopg-binary<=3.2.3',
             'psycopg-pool<=3.2.3',
         ],

{rucio_clients-38.0.0rc1 → rucio_clients-38.0.0rc3}/tests/test_hermes.py

@@ -59,16 +59,8 @@ class MyListener:
         {
             "table_content": [
                 ("hermes", "services_list", "influx,activemq,elastic,email"),
-                (
-                    "hermes",
-                    "elastic_endpoint",
-                    "http://localhost:9200/ddm_events/doc/_bulk",
-                ),
-                (
-                    "hermes",
-                    "influxdb_endpoint",
-                    "http://localhost:8086/api/v2/write?org=rucio&bucket=rucio",
-                ),
+                ("hermes", "elastic_endpoint", "http://elasticsearch:9200/ddm_events/doc/_bulk"),
+                ("hermes", "influxdb_endpoint", "http://influxdb:8086/api/v2/write?org=rucio&bucket=rucio"),
                 ("hermes", "influxdb_token", "mytoken"),
                 ("messaging-hermes", "destination", "/queue/events"),
                 ("messaging-hermes", "brokers", "localhost"),
@@ -76,22 +68,16 @@ class MyListener:
                 ("messaging-hermes", "username", "hermes"),
                 ("messaging-hermes", "password", "supersecret"),
                 ("messaging-hermes", "nonssl_port", 61613),
-                ("messaging-hermes", "send_email", False),
+                ("messaging-hermes", "send_email", True),
+                ("messaging-hermes", "smtp_host", "testing.host"),
+                ("messaging-hermes", "smtp_port", 1234),
             ]
         },
         {
             "table_content": [
                 ("hermes", "services_list", "influx,activemq,elastic,email"),
-                (
-                    "hermes",
-                    "elastic_endpoint",
-                    "http://localhost:9200/ddm_events/doc/_bulk",
-                ),
-                (
-                    "hermes",
-                    "influxdb_endpoint",
-                    "http://localhost:8086/api/v2/write?org=rucio&bucket=rucio",
-                ),
+                ("hermes", "elastic_endpoint", "http://elasticsearch:9200/ddm_events/doc/_bulk"),
+                ("hermes", "influxdb_endpoint", "http://influxdb:8086/api/v2/write?org=rucio&bucket=rucio"),
                 ("hermes", "influxdb_token", "mytoken"),
                 ("messaging-hermes", "destination", "/queue/events"),
                 ("messaging-hermes", "brokers", "localhost"),
@@ -99,9 +85,9 @@ class MyListener:
                 ("messaging-hermes", "username", "hermes"),
                 ("messaging-hermes", "password", "supersecret"),
                 ("messaging-hermes", "nonssl_port", 61613),
-                ("messaging-hermes", "send_email", False),
-                ("messaging-hermes", "smtp-host", "testing.host"),
-                ("messaging-hermes", "smtp-port", 1234),
+                ("messaging-hermes", "send_email", True),
+                ("messaging-hermes", "smtp_host", "testing.host"),
+                ("messaging-hermes", "smtp_port", 1234),
             ]
         }
     ],
@@ -205,7 +191,11 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
         smtp_mock = MagicMock()
         m.setattr(hermes.smtplib, "SMTP", smtp_mock)
         hermes.hermes(once=True)
-        smtp_mock.assert_called_with(host="testing.host", port=1234)
+        smtp_host = config_get("messaging-hermes", "smtp_host", default='', raise_exception=False)
+        if not smtp_host:
+            smtp_mock.assert_called_with()
+        else:
+            smtp_mock.assert_called_with(host="testing.host", port=1234)
     service_dict = {"influx": 0, "elastic": 0, "email": 0, "activemq": 0}
     messages = retrieve_messages(50, old_mode=False)
     for message in messages:
@@ -247,7 +237,7 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
     # Checking influxDB
     assert service_dict["influx"] == 0
     res = requests.get(
-        "http://localhost:8086/query?db=rucio",
+        "http://influxdb:8086/query?db=rucio",
         headers={"Authorization": "Token mytoken"},
         params={"q": "SELECT * FROM deletion"},
     )
@@ -273,7 +263,7 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
     data = ' { "query": { "match_all": {} } }'
     headers = {"Content-Type": "application/json"}
     response = requests.post(
-        "http://localhost:9200/_search?size=1000", data=data, headers=headers
+        "http://elasticsearch:9200/_search?size=1000", data=data, headers=headers
     )
     assert response.status_code == 200
     res = response.json()