YDA-6168: add EL9 support

.github/workflows/python.yml

@@ -5,13 +5,16 @@ on: [push, pull_request]
 jobs:
   lint:
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.12']
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |

data_access_token.py

@@ -1,6 +1,6 @@
 """Functions for token management."""
 
-__copyright__ = 'Copyright (c) 2021-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2021-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import os
@@ -9,7 +9,7 @@
 from traceback import print_exc
 from typing import List
 
-from pysqlcipher3 import dbapi2 as sqlite3
+from sqlcipher3 import dbapi2 as sqlite3
 
 from util import *
 

datarequest.py

@@ -1,6 +1,7 @@
 """Functions to handle data requests."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 __author__    = ('Lazlo Westerhof, Jelmer Zondergeld')
 

deposit.py

@@ -1,6 +1,7 @@
 """Functions for deposit module."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2021-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2021-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import re

folder.py

@@ -1,6 +1,7 @@
 """Functions to act on user-visible folders in the research or vault area."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import time

groups.py

@@ -1,6 +1,7 @@
 """Functions for group management and group queries."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2018-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2018-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import time

mail.py

@@ -1,6 +1,7 @@
 """Rules for sending e-mails."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2020-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2020-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import email

meta.py

@@ -1,6 +1,7 @@
 """JSON metadata handling."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import json

meta_form.py

@@ -1,6 +1,7 @@
 """JSON metadata form handling."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import re

notifications.py

@@ -1,9 +1,9 @@
 """Functions for user notifications."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2021-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2021-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
-
 import json
 import random
 import string

policies.py

@@ -1,6 +1,7 @@
 """iRODS policy implementations."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2020-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2020-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import re

policies_datamanager.py

@@ -1,6 +1,7 @@
 """Policy check functions for datamanager actions."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 from util import *

policies_datapackage_status.py

@@ -1,6 +1,7 @@
 """Policy check functions for data package status transitions."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import folder

policies_datarequest_status.py

@@ -1,6 +1,7 @@
 """Policy check functions for datarequest status transitions."""
+from __future__ import annotations
 
-__copyright__ = "Copyright (c) 2019-2024, Utrecht University"
+__copyright__ = "Copyright (c) 2019-2025, Utrecht University"
 __license__   = "GPLv3, see LICENSE"
 
 import re

policies_folder_status.py

@@ -1,6 +1,7 @@
 """Policy check functions for folder status transitions."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import time

requirements.txt

@@ -2,10 +2,9 @@ setuptools==75.6.0
 MarkupSafe==3.0.2
 Jinja2==3.1.5
 requests==2.32.3
-pyrsistent==0.15.7
 configparser==4.0.2
 contextlib2==0.6.0.post1
-importlib-metadata==2.1.1
+importlib-metadata==8.6.1
 jsonschema==4.23.0
 pathvalidate==0.29.1
 requests_cache==0.5.2
@@ -16,5 +15,5 @@ deepdiff==8.0.1
 persist-queue==0.8.1
 redis==3.5.3
 psutil==6.1.1
-iteration_utilities==0.8.0
-rotki-pysqlcipher3==2024.10.1
+iteration_utilities==0.13.0
+sqlcipher3-binary==0.5.4

revisions.py

@@ -1,6 +1,7 @@
 """Functions for revision management."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import datetime

rules_uu.cfg.template

@@ -68,5 +68,3 @@ arb_enabled                    =
 arb_exempt_resources           =
 arb_min_gb_free                =
 arb_min_percent_free           =
-
-python3_interpreter            =

schema.py

@@ -1,6 +1,7 @@
 """Functions for finding the active schema."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2018-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2018-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import re

schema_transformation.py

@@ -1,6 +1,7 @@
 """Functions for handling schema updates within any yoda-metadata file."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2018-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2018-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 __all__ = ['rule_batch_transform_vault_metadata',

schema_transformations.py

@@ -1,6 +1,7 @@
 """JSON schema transformation functions."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import re

schema_transformations_utils.py

@@ -1,6 +1,7 @@
 """JSON schema transformation utility functions."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import re

settings.py

@@ -1,6 +1,7 @@
 """Functions for user settings."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2021-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2021-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 from typing import Dict,  Sequence

stats.py

@@ -1,6 +1,7 @@
 """Functions for statistics module."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2018-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2018-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 from datetime import datetime

tools/list-data-access-tokens.py

@@ -51,9 +51,9 @@ def get_tokens(token_database, token_database_password, user=None):
         exit_with_error("Error: cannot find token database")
 
     try:
-        from pysqlcipher3 import dbapi2 as sqlite3
+        from sqlcipher3 import dbapi2 as sqlite3
     except ImportError:
-        exit_with_error("Error: pysqlcipher3 not available. It should have been installed by the Yoda playbook.")
+        exit_with_error("Error: sqlcipher3 not available. It should have been installed by the Yoda playbook.")
 
     conn = sqlite3.connect(token_database)
     result = []

util/api.py

@@ -2,8 +2,9 @@
 
 For example usage, see make().
 """
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import base64

util/avu.py

@@ -1,6 +1,7 @@
 """Utility / convenience functions for dealing with AVUs."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import itertools

util/bagit.py

@@ -1,6 +1,7 @@
 """Functions to copy packages to the vault and manage permissions of vault packages."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2023-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2023-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import itertools

util/collection.py

@@ -1,6 +1,7 @@
 """Utility / convenience functions for dealing with collections."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import itertools

util/config.py

@@ -1,6 +1,7 @@
 """Yoda ruleset configuration."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 from typing import List
@@ -146,8 +147,7 @@ def __repr__(self) -> str:
                 vault_copy_max_retries=5,
                 vault_copy_multithread_enabled=True,
                 user_max_connections_enabled=False,
-                user_max_connections_number=4,
-                python3_interpreter='/usr/local/bin/python3')
+                user_max_connections_number=4)
 
 # }}}
 

util/data_object.py

@@ -1,6 +1,7 @@
 """Utility / convenience functions for data object IO."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import binascii

util/group.py

@@ -1,6 +1,7 @@
 """Utility / convenience functions for querying group info."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 from typing import List, TYPE_CHECKING

util/pathutil.py

@@ -1,8 +1,9 @@
 """Utility / convenience functions for dealing with paths."""
+from __future__ import annotations
 
 # (ideally this module would be named 'path', but name conflicts cause too much pain)
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import re

util/policy.py

@@ -1,6 +1,7 @@
 """Utilities for creating PEP rules."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 from typing import Callable, Tuple

util/resources.py

@@ -1,6 +1,7 @@
 """Utility / convenience functions for dealing with resources."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 from typing import List, TYPE_CHECKING

util/rule.py

@@ -1,6 +1,7 @@
 """Python/Rule interface code."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import json

util/spool.py

@@ -9,6 +9,10 @@
 
    It is assumed that functions that use the spool subsystem take care of authorization and logging.
 """
+from __future__ import annotations
+
+__copyright__ = 'Copyright (c) 2023-2025, Utrecht University'
+__license__   = 'GPLv3, see LICENSE'
 
 import os
 from typing import Iterable

util/user.py

@@ -1,6 +1,7 @@
 """Utility / convenience functions for querying user info."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import subprocess

vault.py

@@ -1,6 +1,7 @@
 """Functions to copy packages to the vault and manage permissions of vault packages."""
+from __future__ import annotations
 
-__copyright__ = 'Copyright (c) 2019-2024, Utrecht University'
+__copyright__ = 'Copyright (c) 2019-2025, Utrecht University'
 __license__   = 'GPLv3, see LICENSE'
 
 import os