diracx 0.0.1a48__tar.gz → 0.0.1a50__tar.gz

{diracx-0.0.1a48 → diracx-0.0.1a50}/.github/workflows/deployment.yml

@@ -41,14 +41,14 @@ jobs:
         # We need extglob for REFERENCE_BRANCH substitution
         shell: bash -l -O extglob {0}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ github.token }}
       - run: |
           git fetch --prune --unshallow
           git config --global user.email "ci@diracgrid.org"
           git config --global user.name "DIRACGrid CI"
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.11'
       - name: Installing dependencies
@@ -156,7 +156,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -168,7 +168,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Download diracx wheels
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
             name: diracx-whl
       - name: "Find wheels"
@@ -190,7 +190,7 @@ jobs:
           push: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
           tags: "ghcr.io/diracgrid/diracx/client:${{ needs.deploy-pypi.outputs.new-version }}"
           platforms: linux/amd64,linux/arm64
-          build-args: EXTRA_PACKAGES_TO_INSTALL=DIRAC~=9.0.0a1
+          build-args: EXTRA_PACKAGES_TO_INSTALL=DIRACCommon~=9.0.0a1
       - name: Build and push services (release)
         uses: docker/build-push-action@v6
         if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
@@ -199,7 +199,7 @@ jobs:
           push: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
           tags: "ghcr.io/diracgrid/diracx/services:${{ needs.deploy-pypi.outputs.new-version }}"
           platforms: linux/amd64,linux/arm64
-          build-args: EXTRA_PACKAGES_TO_INSTALL=DIRAC~=9.0.0a1
+          build-args: EXTRA_PACKAGES_TO_INSTALL=DIRACCommon~=9.0.0a1
 
       - name: Build and push client (dev)
         uses: docker/build-push-action@v6
@@ -209,7 +209,7 @@ jobs:
           tags: ghcr.io/diracgrid/diracx/client:dev
           platforms: linux/amd64,linux/arm64
           build-args: |
-            EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration
+            EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration#egg=diraccommon\&subdirectory=dirac-common
       - name: Build and push services (dev)
         uses: docker/build-push-action@v6
         with:
@@ -218,4 +218,85 @@ jobs:
           tags: ghcr.io/diracgrid/diracx/services:dev
           platforms: linux/amd64,linux/arm64
           build-args: |
-            EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration
+            EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration#egg=diraccommon\&subdirectory=dirac-common
+
+  update-charts:
+    name: Update Helm charts
+    needs:
+      - deploy-pypi
+      - docker
+    runs-on: ubuntu-latest
+    if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
+    steps:
+      - name: Checkout diracx
+        uses: actions/checkout@v5
+        with:
+          path: diracx
+
+      - name: Checkout diracx-charts
+        uses: actions/checkout@v5
+        with:
+          repository: DIRACGrid/diracx-charts
+          token: ${{ secrets.CHARTS_UPDATE_TOKEN }}
+          path: diracx-charts
+
+      - name: Configure Git
+        run: |
+          cd diracx-charts
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Update chart versions
+        id: update-versions
+        run: |
+          cd diracx-charts
+          VERSION="${{ needs.deploy-pypi.outputs.new-version }}"
+
+          # Get current chart version before updating
+          CURRENT_CHART_VERSION=$(grep '^version:' diracx/Chart.yaml | sed 's/version: //' | tr -d '"')
+
+          # Use Python script to update versions
+          python ../diracx/.github/workflows/update_chart_version.py \
+            --charts-dir . \
+            --diracx-version "$VERSION"
+
+          # Get new chart version after update
+          NEW_CHART_VERSION=$(grep '^version:' diracx/Chart.yaml | sed 's/version: //' | tr -d '"')
+
+          echo "current_chart_version=$CURRENT_CHART_VERSION" >> $GITHUB_OUTPUT
+          echo "new_chart_version=$NEW_CHART_VERSION" >> $GITHUB_OUTPUT
+          echo "diracx_version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Install pre-commit
+        run: |
+          pip install pre-commit
+
+      - name: Run pre-commit to update README
+        run: |
+          cd diracx-charts
+          pre-commit run --all-files || true
+
+      - name: Commit and push changes
+        if: success()
+        run: |
+          cd diracx-charts
+
+          # Stage all changes
+          git add -A
+
+          # Check if there are changes to commit
+          if ! git diff --cached --quiet; then
+            # Commit the changes
+            git commit -m "chore: bump chart to ${{ steps.update-versions.outputs.new_chart_version }} for DiracX ${{ steps.update-versions.outputs.diracx_version }}
+
+            - Update appVersion to ${{ steps.update-versions.outputs.diracx_version }}
+            - Update image tag to ${{ steps.update-versions.outputs.diracx_version }}
+            - Bump chart version from ${{ steps.update-versions.outputs.current_chart_version }} to ${{ steps.update-versions.outputs.new_chart_version }}"
+
+            # Push the commit to main branch
+            git push origin main
+
+            echo "✅ Successfully pushed chart version ${{ steps.update-versions.outputs.new_chart_version }} and tag ${TAG_NAME}"
+          else
+            echo "No changes to commit"
+          fi

diracx-0.0.1a50/.github/workflows/generate_pixi_tasks_doc.py

@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+import json
+import subprocess
+from collections import defaultdict
+
+
+def get_task_group(task_name):
+    if task_name.startswith("pytest-diracx"):
+        return "DiracX"
+    if task_name.startswith("pytest-gubbins"):
+        return "Gubbins"
+    if task_name.startswith("mkdocs"):
+        return "Documentation"
+    if task_name == "pre-commit":
+        return "Pre-commit"
+    if task_name == "generate-client":
+        return "Client Generation"
+    if task_name == "shellcheck":
+        return "Shellcheck"
+    return "Default"
+
+
+def main():
+    """Generate the pixi-tasks.md file."""
+    result = subprocess.run(
+        ["pixi", "task", "list", "--json"],  # noqa: S607
+        capture_output=True,
+        text=True,
+    )
+    environments = json.loads(result.stdout)
+
+    tasks_by_group = defaultdict(list)
+    for env in environments:
+        for feature in env["features"]:
+            for task in feature["tasks"]:
+                group = get_task_group(task["name"])
+                tasks_by_group[group].append(task)
+
+    with open("docs/dev/reference/pixi-tasks.md", "w") as f:
+        f.write("# Pixi Tasks\n\n")
+        f.write("*This page is auto-generated. Do not edit directly.*\n\n")
+        f.write("DiracX uses [Pixi](https://pixi.dev/) as package manager\n")
+        f.write("This page documents the available pixi tasks.\n\n")
+
+        for group in sorted(tasks_by_group.keys()):
+            f.write(f"## {group} Tasks\n\n")
+            # Remove duplicates
+            tasks = list({v["name"]: v for v in tasks_by_group[group]}.values())
+            for task in sorted(tasks, key=lambda x: x["name"]):
+                description = (
+                    task.get("description") or task.get("cmd") or "No description"
+                )
+                f.write(f"- `{task['name']}`: {description}\n")
+            f.write("\n")
+
+        f.write("Generated by .github/workflows/generate_pixi_tasks_doc.py\n")
+
+
+if __name__ == "__main__":
+    main()

{diracx-0.0.1a48 → diracx-0.0.1a50}/.github/workflows/integration.yml

@@ -23,8 +23,8 @@ jobs:
         dirac-branch:
           - integration
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.11'
       - name: Build wheels

{diracx-0.0.1a48 → diracx-0.0.1a50}/.github/workflows/main.yml

@@ -13,26 +13,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
   shellcheck:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.12
+        uses: actions/checkout@v5
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           run-install: false
           post-cleanup: false
-      - name: Apply workarounds
-        run: |
-          # Workaround for https://github.com/prefix-dev/pixi/issues/3762
-          sed -i.bak 's@editable = true@editable = false@g' pixi.toml
-          rm pixi.toml.bak
-          # Add annotations to github actions
-          pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
-          # Show any changes
-          git diff
-      - uses: prefix-dev/setup-pixi@v0.8.12
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           cache: false
           environments: shellcheck
@@ -62,8 +52,8 @@ jobs:
           - gubbins-cli
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.12
+        uses: actions/checkout@v5
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           run-install: false
           post-cleanup: false
@@ -72,18 +62,16 @@ jobs:
           # Workaround for https://github.com/prefix-dev/pixi/issues/3762
           sed -i.bak 's@editable = true@editable = false@g' pixi.toml
           rm pixi.toml.bak
-          # Add annotations to github actions
-          pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.8.12
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           cache: false
           environments: ${{ matrix.package }}
       - name: Run pytest
         run: pixi run pytest-${{ matrix.package }} --cov-report=xml:coverage.xml --junitxml=report.xml
       - name: Upload coverage report
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.5.1
 
   pytest-integration:
     runs-on: ubuntu-latest
@@ -95,8 +83,8 @@ jobs:
           - gubbins
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.12
+        uses: actions/checkout@v5
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           run-install: false
           post-cleanup: false
@@ -105,11 +93,9 @@ jobs:
           # Workaround for https://github.com/prefix-dev/pixi/issues/3762
           sed -i.bak 's@editable = true@editable = false@g' pixi.toml
           rm pixi.toml.bak
-          # Add annotations to github actions
-          pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.8.12
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           cache: false
           environments: ${{ matrix.extension == 'diracx' && 'default' || 'default-gubbins' }}
@@ -209,7 +195,7 @@ jobs:
         run: |
           pixi run -e ${{ matrix.extension == 'diracx' && 'default' || 'default-gubbins' }} python -m diracx.testing coverage collect-demo --demo-dir=../diracx-charts/.demo
       - name: Upload coverage report
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.5.1
         with:
           files: ./coverage-pytest.xml,./coverage-demo.xml
 
@@ -221,18 +207,12 @@ jobs:
         package: [diracx, gubbins]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.12
+        uses: actions/checkout@v5
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           run-install: false
           post-cleanup: false
-      - name: Apply workarounds
-        run: |
-          # Add annotations to github actions
-          pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
-          # Show any changes
-          git diff
-      - uses: prefix-dev/setup-pixi@v0.8.12
+      - uses: prefix-dev/setup-pixi@v0.9.0
         with:
           cache: false
           locked: false

diracx-0.0.1a50/.github/workflows/update_chart_version.py

@@ -0,0 +1,158 @@
+#!/usr/bin/env python3
+"""Script to update chart versions based on DiracX releases."""
+
+from __future__ import annotations
+
+import argparse
+import re
+import sys
+from pathlib import Path
+
+
+def parse_version(version_str: str) -> tuple[int, int, int, str | None]:
+    """Parse a semantic version string into components.
+
+    Args:
+        version_str: Version string like "1.0.0-alpha.1"
+
+    Returns:
+        Tuple of (major, minor, patch, pre_release_suffix)
+
+    """
+    # Remove leading 'v' if present
+    version_str = version_str.lstrip("v")
+
+    # Pattern for semver with optional pre-release
+    pattern = r"^(\d+)\.(\d+)\.(\d+)(?:-(.+))?$"
+    match = re.match(pattern, version_str)
+
+    if not match:
+        raise ValueError(f"Invalid version format: {version_str}")
+
+    major, minor, patch, pre_release = match.groups()
+    return int(major), int(minor), int(patch), pre_release
+
+
+def bump_version(current_version: str) -> str:
+    """Bump a version automatically - alpha if present, else patch.
+
+    Args:
+        current_version: Current version string
+
+    Returns:
+        New version string
+
+    """
+    major, minor, patch, pre_release = parse_version(current_version)
+
+    if pre_release and pre_release.startswith("alpha."):
+        # Increment alpha number
+        alpha_match = re.match(r"alpha\.(\d+)", pre_release)
+        if alpha_match:
+            alpha_num = int(alpha_match.group(1)) + 1
+            return f"{major}.{minor}.{patch}-alpha.{alpha_num}"
+        else:
+            # Invalid alpha format, start with alpha.1
+            return f"{major}.{minor}.{patch}-alpha.1"
+    else:
+        # No alpha suffix, bump patch version
+        return f"{major}.{minor}.{patch + 1}"
+
+
+def update_chart_yaml(
+    chart_path: Path, diracx_version: str, new_chart_version: str
+) -> None:
+    """Update Chart.yaml with new versions."""
+    content = chart_path.read_text()
+
+    # Update appVersion
+    content = re.sub(
+        r"^appVersion:\s*.*$",
+        f"appVersion: {diracx_version}",
+        content,
+        flags=re.MULTILINE,
+    )
+
+    # Update version
+    content = re.sub(
+        r"^version:\s*.*$",
+        f'version: "{new_chart_version}"',
+        content,
+        flags=re.MULTILINE,
+    )
+
+    chart_path.write_text(content)
+
+
+def update_values_yaml(values_path: Path, diracx_version: str) -> None:
+    """Update values.yaml with new image tag."""
+    content = values_path.read_text()
+
+    # Update only the main services image tag under global.images.tag
+    # This pattern looks for the first occurrence of 'tag:' after 'images:' section
+    content = re.sub(
+        r"(global:\s*[\s\S]*?images:\s*[\s\S]*?tag:\s*).*?(\s)",
+        f"\\1{diracx_version}\\2",
+        content,
+        count=1,
+    )
+
+    values_path.write_text(content)
+
+
+def main() -> None:
+    """Main function."""
+    parser = argparse.ArgumentParser(
+        description="Update chart versions for DiracX release"
+    )
+    parser.add_argument(
+        "--charts-dir", type=Path, default=".", help="Path to charts directory"
+    )
+    parser.add_argument(
+        "--diracx-version", required=True, help="DiracX version (e.g., v0.0.1a49)"
+    )
+
+    args = parser.parse_args()
+
+    # Define paths
+    chart_yaml = args.charts_dir / "diracx" / "Chart.yaml"
+    values_yaml = args.charts_dir / "diracx" / "values.yaml"
+
+    if not chart_yaml.exists():
+        print(f"Error: Chart.yaml not found at {chart_yaml}")
+        sys.exit(1)
+
+    if not values_yaml.exists():
+        print(f"Error: values.yaml not found at {values_yaml}")
+        sys.exit(1)
+
+    # Get current chart version
+    chart_content = chart_yaml.read_text()
+    version_match = re.search(
+        r'^version:\s*["\']?([^"\']+)["\']?$', chart_content, re.MULTILINE
+    )
+
+    if not version_match:
+        print("Error: Could not find version in Chart.yaml")
+        sys.exit(1)
+
+    current_chart_version = version_match.group(1)
+    print(f"Current chart version: {current_chart_version}")
+
+    # Calculate new chart version (alpha if present, else patch)
+    new_chart_version = bump_version(current_chart_version)
+    print(f"New chart version: {new_chart_version}")
+
+    # Update files
+    print("Updating Chart.yaml...")
+    update_chart_yaml(chart_yaml, args.diracx_version, new_chart_version)
+
+    print("Updating values.yaml...")
+    update_values_yaml(values_yaml, args.diracx_version)
+
+    print(f"Successfully updated charts for DiracX {args.diracx_version}")
+    print(f"Chart version: {current_chart_version} -> {new_chart_version}")
+
+
+if __name__ == "__main__":
+    main()

{diracx-0.0.1a48 → diracx-0.0.1a50}/.github/workflows/update_security_txt_expiry.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 

{diracx-0.0.1a48 → diracx-0.0.1a50}/.github/workflows/vulnerabilities.yml

@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           tags: true
 
       - name: Run Trivy (client:dev)
-        uses: aquasecurity/trivy-action@0.32.0
+        uses: aquasecurity/trivy-action@0.33.1
         with:
           image-ref: "ghcr.io/diracgrid/diracx/client:dev"
           format: "sarif"
@@ -35,7 +35,7 @@ jobs:
           category: "client-dev"
 
       - name: Run Trivy (services:dev)
-        uses: aquasecurity/trivy-action@0.32.0
+        uses: aquasecurity/trivy-action@0.33.1
         with:
           image-ref: "ghcr.io/diracgrid/diracx/services:dev"
           format: "sarif"
@@ -61,7 +61,7 @@ jobs:
 
       - name: Run Trivy (client:release)
         if: ${{ steps.get-latest-tag.outputs.latest_tag != '' }}
-        uses: aquasecurity/trivy-action@0.32.0
+        uses: aquasecurity/trivy-action@0.33.1
         with:
           image-ref: "ghcr.io/diracgrid/diracx/client:${{ steps.get-latest-tag.outputs.latest_tag }}"
           format: "sarif"
@@ -77,7 +77,7 @@ jobs:
 
       - name: Run Trivy (services:release)
         if: ${{ steps.get-latest-tag.outputs.latest_tag != '' }}
-        uses: aquasecurity/trivy-action@0.32.0
+        uses: aquasecurity/trivy-action@0.33.1
         with:
           image-ref: "ghcr.io/diracgrid/diracx/services:${{ steps.get-latest-tag.outputs.latest_tag }}"
           format: "sarif"

{diracx-0.0.1a48 → diracx-0.0.1a50}/.pre-commit-config.yaml

@@ -7,6 +7,9 @@ default_install_hook_types:
 default_language_version:
   python: python3
 
+ci:
+  skip: [generate-pixi-docs]
+
 default_stages: [pre-commit]
 
 repos:
@@ -18,7 +21,7 @@ repos:
         args: ["--verbose"]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -27,14 +30,14 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.12.7'
+    rev: 'v0.13.0'
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.1
+    rev: v1.18.1
     hooks:
       - id: mypy
         additional_dependencies:
@@ -62,3 +65,21 @@ repos:
     hooks:
     - id: codespell
       args: ["-w"]
+
+  - repo: local
+    hooks:
+      - id: check-lollygag
+        name: check for lollygag
+        types: [python]
+        entry: '(?i)lollygag'
+        language: pygrep
+        files: ^diracx
+
+  - repo: local
+    hooks:
+      - id: generate-pixi-docs
+        name: Generate pixi tasks documentation
+        entry: pixi run -e default python .github/workflows/generate_pixi_tasks_doc.py
+        language: system
+        pass_filenames: false
+        files: ^pixi\.toml$|^pixi\.lock$   # only run if pixi files change

diracx-0.0.1a50/.readthedocs.yaml

@@ -0,0 +1,25 @@
+ version: 2
+
+ build:
+   os: "ubuntu-24.04"
+   tools:
+     python: "3"
+   # We recommend using a requirements file for reproducible builds.
+   # This is just a quick example to get started.
+   # https://docs.readthedocs.io/page/guides/reproducible-builds.html
+   jobs:
+      create_environment:
+        - asdf plugin add pixi
+        - asdf install pixi latest
+        - asdf global pixi latest
+
+      install:
+        - pixi install -e mkdocs
+
+      build:
+        html:
+          - pixi run -e mkdocs mkdocs-build --site-dir $READTHEDOCS_OUTPUT/html
+
+ mkdocs:
+   configuration: mkdocs.yml
+   fail_on_warning: true

{diracx-0.0.1a48 → diracx-0.0.1a50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx
-Version: 0.0.1a48
+Version: 0.0.1a50
 Summary: Client installation for users of DiracX installations
 License: GPL-3.0-only
 License-File: LICENSE