diracx 0.0.1a49__tar.gz → 0.0.2__tar.gz

{diracx-0.0.1a49 → diracx-0.0.2}/.github/workflows/deployment.yml

@@ -2,17 +2,11 @@ name: Deployment
 
 on:
   push:
+    tags:
+      - 'v*'
   pull_request:
   schedule:
     - cron: '0 10 * * *'
-  workflow_dispatch:
-    inputs:
-      check-ci:
-        description: "Require the CI to have passed for this commit"
-        required: true
-        default: "yes"
-      version:
-        description: "Override the release version number (e.g. 8.0.0a5)"
 
 jobs:
   deploy-pypi:
@@ -63,57 +57,21 @@ jobs:
       - name: Validate README for PyPI
         run: |
           python -m readme_renderer README.md -o /tmp/README.html
-      - name: Prepare release notes
-        run: |
-          set -xeuo pipefail
-          IFS=$'\n\t'
-          # Needed for the advanced pattern matching used in REFERENCE_BRANCH
-          PREV_VERSION=$(git describe --tags --abbrev=0)
-          # In case of manual trigger,
-          # GITHUB_REF is of the form refs/heads/main -> we want main
-          # In case of PR it is of the form refs/pull/59/merge -> we want pull/59/merge
-          REFERENCE_BRANCH=${GITHUB_REF##refs*(/heads)/}
-          echo "Making release notes for ${REFERENCE_BRANCH} since ${PREV_VERSION}"
-          (git log ${PREV_VERSION}...${REFERENCE_BRANCH} --oneline --no-merges --) > release.notes.new
-          cat release.notes.new
-      - name: Create tag if required
+      - name: Extract version from tag
         id: check-tag
         run: |
           set -xeuo pipefail
           IFS=$'\n\t'
-          # Only do a real release for workflow_dispatch events
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "Will create a real release"
-            export NEW_VERSION="v${{ github.event.inputs.version }}"
-            if [[ "${NEW_VERSION}" == "v" ]]; then
-              # If version wasn't given as an input to the workflow, use setuptools_scm to guess while removing "dev" portion of the version number
-              NEW_VERSION=v$(python -m setuptools_scm | sed 's@Guessed Version @@g' | sed -E 's@(\.dev|\+g).+@@g')
-              export NEW_VERSION
-            fi
-            echo "Release will be named $NEW_VERSION"
-            # Validate the version
-            # Ensure the version doesn't look like a PEP-440 "dev release" (which might happen if the automatic version bump has issues)
-            python -c $'from packaging.version import Version; v = Version('"'$NEW_VERSION'"$')\nif v.is_devrelease:\n    raise ValueError(v)'
-            # Make sure we always only create pre-releases
-            python -c $'from packaging.version import Version; v = Version('"'$NEW_VERSION'"$')\nif not v.is_prerelease:\n    raise ValueError("integration should only be used for pre-releases")'
-            # Commit the release notes
-            mv release.notes release.notes.old
-            cat release.notes.old
-            (echo -e "[${NEW_VERSION}]" &&  cat release.notes.new release.notes.old) > release.notes
-            ###################3
-            # TODO: we should add the release notes somewhere at some point
-            # now we just don't do it because main branch is protected
-            # and we can't push directly from the CI
-            #git add release.notes
-            #git commit -m "docs: Add release notes for $NEW_VERSION"
-            # Stash is mandatory not to leave the repo dirty
-            git stash
-            ########################
-            git show
-            # Create the tag
-            git tag "$NEW_VERSION"
+          # Check if this is a tag push
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            # Extract version from the tag
+            export NEW_VERSION="${GITHUB_REF#refs/tags/}"
+            echo "Deploying release $NEW_VERSION"
             echo "create-release=true" >> $GITHUB_OUTPUT
             echo "new-version=$NEW_VERSION" >> $GITHUB_OUTPUT
+          else
+            echo "Not a tag push, skipping release"
+            echo "create-release=false" >> $GITHUB_OUTPUT
           fi
       - name: Build distributions
         run: |
@@ -129,21 +87,6 @@ jobs:
           name: diracx-whl
           path: dist/diracx*.whl
           retention-days: 5
-      - name: Make release on GitHub
-        if: steps.check-tag.outputs.create-release == 'true'
-        run: |
-          set -e
-          export NEW_VERSION=${{ steps.check-tag.outputs.new-version }}
-          REFERENCE_BRANCH=${GITHUB_REF##refs*(/heads)/}
-          echo "Pushing tagged release notes to ${REFERENCE_BRANCH}"
-          git push "origin" "${REFERENCE_BRANCH}"
-          echo "Making GitHub release for ${NEW_VERSION}"
-          .github/workflows/make_release.py \
-            --repo="${{ github.repository }}" \
-            --token="${{ secrets.GITHUB_TOKEN }}" \
-            --version="${NEW_VERSION}" \
-            --rev="$(git rev-parse HEAD)" \
-            --release-notes-fn="release.notes.new"
       # Use trusted publisher for pypi
       # https://docs.pypi.org/trusted-publishers/
       - name: Publish package on PyPI
@@ -190,7 +133,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=DIRACCommon~=9.0.0a1
+          build-args: EXTRA_PACKAGES_TO_INSTALL=DIRACCommon~=9.0.0
       - name: Build and push services (release)
         uses: docker/build-push-action@v6
         if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
@@ -199,7 +142,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=DIRACCommon~=9.0.0a1
+          build-args: EXTRA_PACKAGES_TO_INSTALL=DIRACCommon~=9.0.0
 
       - name: Build and push client (dev)
         uses: docker/build-push-action@v6

diracx-0.0.2/.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.1a49 → diracx-0.0.2}/.github/workflows/main.yml

@@ -13,17 +13,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
   shellcheck:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           run-install: false
           post-cleanup: false
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           cache: false
           environments: shellcheck
@@ -54,7 +53,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           run-install: false
           post-cleanup: false
@@ -65,7 +64,7 @@ jobs:
           rm pixi.toml.bak
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           cache: false
           environments: ${{ matrix.package }}
@@ -83,9 +82,29 @@ jobs:
           - diracx
           - gubbins
     steps:
+      - name: Free disk space
+        run: |
+          echo "Before cleanup:"
+          df -h
+
+          # remove .NET SDKs
+          sudo rm -rf /usr/share/dotnet || true
+          # remove Android SDK
+          sudo rm -rf usr/local/lib/android || true
+          # remove Haskell Compiler
+          sudo rm -rf /opt/ghc || true
+          sudo rm -rf /usr/local/.ghcup || true
+
+          sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
+
+          # prune docker
+          docker system prune -af || true
+
+          echo "After cleanup:"
+          df -h
       - name: Checkout code
         uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           run-install: false
           post-cleanup: false
@@ -96,7 +115,7 @@ jobs:
           rm pixi.toml.bak
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           cache: false
           environments: ${{ matrix.extension == 'diracx' && 'default' || 'default-gubbins' }}
@@ -136,6 +155,9 @@ jobs:
         if: ${{ matrix.extension == 'gubbins' }}
         run: |
           docker load --input /tmp/gubbins_services_image.tar
+          # Free up disk space by removing the tarball after loading the image
+          rm -Rf /tmp/gubbins_services_image.tar
+          docker builder prune -af || true
           docker image ls -a
       - name: Start demo
         run: |
@@ -153,7 +175,7 @@ jobs:
           if [ ${{ matrix.extension }} == 'gubbins' ]; then
             # We have to copy the code to another directory
             # and make it a git repository by itself because otherwise the
-            # root in the pyproject to do not make sense once mounted
+            # root in the pyproject do not make sense once mounted
             # in the containers.
             cp -r ./extensions/gubbins /tmp/
             sed -i 's@../..@.@g' /tmp/gubbins/pyproject.toml
@@ -209,11 +231,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           run-install: false
           post-cleanup: false
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.2
         with:
           cache: false
           locked: false

diracx-0.0.2/.github/workflows/release-please.yml

@@ -0,0 +1,20 @@
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+name: release-please
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v4
+        with:
+          token: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
+          release-type: simple

{diracx-0.0.1a49 → diracx-0.0.2}/.github/workflows/vulnerabilities.yml

@@ -29,7 +29,7 @@ jobs:
           output: "client-dev-vulnerability-report.sarif"
 
       - name: Upload SARIF to GitHub Security (client:dev)
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: "client-dev-vulnerability-report.sarif"
           category: "client-dev"
@@ -43,7 +43,7 @@ jobs:
           skip-setup-trivy: true
 
       - name: Upload SARIF to GitHub Security (services:dev)
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: "services-dev-vulnerability-report.sarif"
           category: "services-dev"
@@ -70,7 +70,7 @@ jobs:
 
       - name: Upload SARIF to GitHub Security (client:rel)
         if: ${{ steps.get-latest-tag.outputs.latest_tag != '' }}
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: "client-rel-vulnerability-report.sarif"
           category: "client-rel"
@@ -86,7 +86,7 @@ jobs:
 
       - name: Upload SARIF to GitHub Security (services:rel)
         if: ${{ steps.get-latest-tag.outputs.latest_tag != '' }}
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: "services-rel-vulnerability-report.sarif"
           category: "services-rel"

{diracx-0.0.1a49 → diracx-0.0.2}/.pre-commit-config.yaml

@@ -7,11 +7,14 @@ default_install_hook_types:
 default_language_version:
   python: python3
 
+ci:
+  skip: [generate-pixi-docs]
+
 default_stages: [pre-commit]
 
 repos:
   - repo: https://github.com/compilerla/conventional-pre-commit
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
@@ -27,14 +30,14 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.12.11'
+    rev: 'v0.14.1'
     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.2
     hooks:
       - id: mypy
         additional_dependencies:
@@ -43,12 +46,13 @@ repos:
           - types-PyYAML
           - types-cachetools
           - types-requests
+          - types-python-dateutil
           - types-aiobotocore[essential]
           - boto3-stubs[essential]
         exclude: ^(diracx-client/src/diracx/client/_generated|diracx-[a-z]+/tests/|diracx-testing/|build|extensions/gubbins/gubbins-client/src/gubbins/client/_generated)
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.22
+    rev: 1.0.0
     hooks:
     - id: mdformat
       args: ["--number"]
@@ -71,3 +75,12 @@ repos:
         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.1a49 → diracx-0.0.2}/.readthedocs.yaml

@@ -8,9 +8,17 @@
    # This is just a quick example to get started.
    # https://docs.readthedocs.io/page/guides/reproducible-builds.html
    jobs:
-     pre_install:
-       - pip install mkdocs-material
-       - pip install mkdocs-diracx-plugin@git+https://github.com/DIRACGrid/mkdocs-diracx-plugin
+      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

diracx-0.0.2/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Changelog
+
+## [0.0.2](https://github.com/DIRACGrid/diracx/compare/v0.0.1...v0.0.2) (2025-10-22)
+
+### Bug Fixes
+
+- correct release-please integration in deployment workflow ([#683](https://github.com/DIRACGrid/diracx/issues/683)) ([0084328](https://github.com/DIRACGrid/diracx/commit/00843286b49a2a075226ad47af746d03b9413d60))
+
+## [0.0.1](https://github.com/DIRACGrid/diracx/compare/v0.0.1...v0.0.1) (2025-10-22)
+
+### Features
+
+- DiracX is here! This is the companion release of DIRAC v9 and the first non-prerelease version of DiracX.
+
+### Miscellaneous Chores
+
+- release 0.0.1 ([615014d](https://github.com/DIRACGrid/diracx/commit/615014dcf87d985c7b286b1c8d94e4c4520d8463))

{diracx-0.0.1a49 → diracx-0.0.2}/PKG-INFO

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

{diracx-0.0.1a49 → diracx-0.0.2}/diracx-cli/src/diracx/cli/auth.py

@@ -129,7 +129,7 @@ async def logout():
             # Revoke refresh token
             try:
                 await api.auth.revoke_refresh_token_by_refresh_token(
-                    client_id=api.client_id, refresh_token=credentials.refresh_token
+                    client_id=api.client_id, token=credentials.refresh_token
                 )
             except Exception as e:
                 print(f"Error revoking the refresh token {e!r}")

{diracx-0.0.1a49 → diracx-0.0.2}/diracx-client/src/diracx/client/_generated/aio/operations/_operations.py

@@ -35,7 +35,6 @@ from ...operations._operations import (
     build_auth_initiate_authorization_flow_request,
     build_auth_initiate_device_flow_request,
     build_auth_revoke_refresh_token_by_jti_request,
-    build_auth_revoke_refresh_token_by_refresh_token_request,
     build_auth_userinfo_request,
     build_config_serve_config_request,
     build_jobs_add_heartbeat_request,
@@ -293,6 +292,7 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
         raise_if_not_implemented(
             self.__class__,
             [
+                "revoke_refresh_token_by_refresh_token",
                 "get_oidc_token",
             ],
         )
@@ -583,59 +583,6 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
 
         return deserialized  # type: ignore
 
-    @distributed_trace_async
-    async def revoke_refresh_token_by_refresh_token(self, *, refresh_token: str, client_id: str, **kwargs: Any) -> str:
-        """Revoke Refresh Token By Refresh Token.
-
-        Revoke a refresh token.
-
-        :keyword refresh_token: Required.
-        :paramtype refresh_token: str
-        :keyword client_id: Required.
-        :paramtype client_id: str
-        :return: str
-        :rtype: str
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-        error_map: MutableMapping = {
-            401: ClientAuthenticationError,
-            404: ResourceNotFoundError,
-            409: ResourceExistsError,
-            304: ResourceNotModifiedError,
-        }
-        error_map.update(kwargs.pop("error_map", {}) or {})
-
-        _headers = kwargs.pop("headers", {}) or {}
-        _params = kwargs.pop("params", {}) or {}
-
-        cls: ClsType[str] = kwargs.pop("cls", None)
-
-        _request = build_auth_revoke_refresh_token_by_refresh_token_request(
-            refresh_token=refresh_token,
-            client_id=client_id,
-            headers=_headers,
-            params=_params,
-        )
-        _request.url = self._client.format_url(_request.url)
-
-        _stream = False
-        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
-            _request, stream=_stream, **kwargs
-        )
-
-        response = pipeline_response.http_response
-
-        if response.status_code not in [200]:
-            map_error(status_code=response.status_code, response=response, error_map=error_map)
-            raise HttpResponseError(response=response)
-
-        deserialized = self._deserialize("str", pipeline_response.http_response)
-
-        if cls:
-            return cls(pipeline_response, deserialized, {})  # type: ignore
-
-        return deserialized  # type: ignore
-
     @distributed_trace_async
     async def revoke_refresh_token_by_jti(self, jti: str, **kwargs: Any) -> str:
         """Revoke Refresh Token By Jti.

{diracx-0.0.1a49 → diracx-0.0.2}/diracx-client/src/diracx/client/_generated/models/__init__.py

@@ -14,6 +14,7 @@ if TYPE_CHECKING:
 from ._models import (  # type: ignore
     BodyAuthGetOidcToken,
     BodyAuthGetOidcTokenGrantType,
+    BodyAuthRevokeRefreshTokenByRefreshToken,
     BodyJobsRescheduleJobs,
     BodyJobsUnassignBulkJobsSandboxes,
     GroupInfo,
@@ -65,6 +66,7 @@ from ._patch import patch_sdk as _patch_sdk
 __all__ = [
     "BodyAuthGetOidcToken",
     "BodyAuthGetOidcTokenGrantType",
+    "BodyAuthRevokeRefreshTokenByRefreshToken",
     "BodyJobsRescheduleJobs",
     "BodyJobsUnassignBulkJobsSandboxes",
     "GroupInfo",

{diracx-0.0.1a49 → diracx-0.0.2}/diracx-client/src/diracx/client/_generated/models/_models.py

@@ -94,6 +94,46 @@ class BodyAuthGetOidcTokenGrantType(_serialization.Model):
     """OAuth2 Grant type."""
 
 
+class BodyAuthRevokeRefreshTokenByRefreshToken(_serialization.Model):
+    """Body_auth_revoke_refresh_token_by_refresh_token.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar token: The refresh token to revoke. Required.
+    :vartype token: str
+    :ivar token_type_hint: Hint for the type of token being revoked.
+    :vartype token_type_hint: str
+    :ivar client_id: The client ID of the application requesting the revocation.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        "token": {"required": True},
+    }
+
+    _attribute_map = {
+        "token": {"key": "token", "type": "str"},
+        "token_type_hint": {"key": "token_type_hint", "type": "str"},
+        "client_id": {"key": "client_id", "type": "str"},
+    }
+
+    def __init__(
+        self, *, token: str, token_type_hint: Optional[str] = None, client_id: str = "myDIRACClientID", **kwargs: Any
+    ) -> None:
+        """
+        :keyword token: The refresh token to revoke. Required.
+        :paramtype token: str
+        :keyword token_type_hint: Hint for the type of token being revoked.
+        :paramtype token_type_hint: str
+        :keyword client_id: The client ID of the application requesting the revocation.
+        :paramtype client_id: str
+        """
+        super().__init__(**kwargs)
+        self.token = token
+        self.token_type_hint = token_type_hint
+        self.client_id = client_id
+
+
 class BodyJobsRescheduleJobs(_serialization.Model):
     """Body_jobs_reschedule_jobs.