did_meta_plugin: reconcile conflict rucio#6059

.github/SECURITY.md

@@ -5,7 +5,9 @@
 Rucio follows a release policy, based on [semantic versioning](https://semver.org),
 with **major** (named) releases. Approximately every 4 months we produce a major 
 release with a version number like **x.0.0** (with x > 0). This release line is 
-maintained with minor/patch releases published every two weeks.
+maintained with minor/patch releases published every two weeks. Once a new major
+release line is released, the previous release line becomes inactive and will
+not be maintained!
 
 Typically once a year we will designate a release line a **Long-term Support** (LTS) 
 release line. This release line will be supported with **security** and **critical** 

.github/workflows/autotest.yml

@@ -6,6 +6,10 @@ on:
   schedule:
     - cron: '0 3 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   add_header:
     if: github.repository_owner == 'rucio' || github.event_name != 'schedule'

.github/workflows/imagecache.yml

@@ -1,10 +1,14 @@
 name: Daily image cache build for autotests
 
 on:
-  workflow_dispatch: {}
+  workflow_dispatch:
   schedule:
     - cron: '0 3 * * 1-5'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   setup:
     runs-on: ubuntu-latest

.github/workflows/integration_tests.yml

@@ -1,8 +1,12 @@
 name: End to End integration tests
 
 on:
-  - pull_request
-  - push
+  pull_request:
+  push:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   setup:

.github/workflows/unit_tests.yml

@@ -1,18 +1,22 @@
 name: Unit Tests
 
 on:
-    pull_request:
-    push:
-    schedule:
-      - cron: '0 3 * * *'
+  pull_request:
+  push:
+  schedule:
+    - cron: '0 3 * * *'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
       runs-on: ubuntu-latest
 
       strategy:
           matrix:
-            python-version: ["pypy3.9", "pypy3.10", "3.9", "3.10", "3.11", "3.12"]
+            python-version: ["3.9", "3.10", "3.11", "3.12"]
 
       steps:
           - uses: actions/checkout@v4
@@ -36,6 +40,6 @@ jobs:
             run: pytest tests/rucio --cov=lib/rucio
 
           - name: Upload coverage reports to Codecov
-            uses: codecov/codecov-action@v4.5.0
+            uses: codecov/codecov-action@v5.4.0
             with:
               token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/vo_tests.yml

@@ -1,9 +1,13 @@
 name: VO-specific tests
 
 on:
-  - pull_request
-  - push
-  - workflow_dispatch
+  pull_request:
+  push:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   setup:

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
+  rev: v5.0.0
   hooks:
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/PyCQA/flake8
-  rev: 4.0.1
+  rev: 7.1.1
   hooks:
   - id: flake8
 - repo: local
@@ -16,7 +16,7 @@ repos:
     entry: tools/add_header
     language: system
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.3.3
+  rev: v0.9.3
   hooks:
     - id: ruff
       args: [ --fix ]

AUTHORS.rst

@@ -67,6 +67,8 @@ Individual contributors to the source code
 - Aksel Lunde Aase <aksel.lunde.aase@gmail.com>, 2022
 - Elena Gazzarrini <gazzarrini.elena@gmail.com>, 2022-2023
 - Maximilian Linhoff, <maximilian.linhoff@tu-dortmund.de>, 2024
+- Eric Banzuzi, <eric.banzuzi@gmail.com>, 2024
+- Paul Millar, <paul.millar@desy.de>, 2025
 
 Organisations employing contributors
 ------------------------------------
@@ -95,3 +97,4 @@ Organisations employing contributors
 - University of Chicago (USA)
 - Purdue University (USA)
 - TU Dortmund University (Germany)
+- Deutsches Elektronen-Synchrotron DESY (Germany)