From 2c632008ca6fe11e1027780882b5542dfdc80c47 Mon Sep 17 00:00:00 2001 From: Scartography Date: Mon, 12 Jan 2026 17:12:36 +0100 Subject: [PATCH 1/2] remove some comments from the python package workflow, add notify container images and try to trigger a build --- .github/workflows/notify-container-images.yml | 39 +++++++++++++++++++ .github/workflows/python-package.yml | 8 ++-- 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/notify-container-images.yml diff --git a/.github/workflows/notify-container-images.yml b/.github/workflows/notify-container-images.yml new file mode 100644 index 0000000..1c5ea23 --- /dev/null +++ b/.github/workflows/notify-container-images.yml @@ -0,0 +1,39 @@ +name: notify container-images + +on: + push: + branches: ['**'] + tags: ['[0-9][0-9][0-9][0-9].*'] + +jobs: + dispatch: + runs-on: ubuntu-latest + steps: + - name: Determine Image Flavor + id: vars + run: | + if [[ "${{ github.ref }}" == refs/tags/* ]]; then + echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT + echo "type=version" >> $GITHUB_OUTPUT + elif [[ "${{ github.ref }}" == refs/heads/main ]]; then + echo "tag=latest" >> $GITHUB_OUTPUT + echo "type=rolling" >> $GITHUB_OUTPUT + else + # Any other branch (feature/fix/dev) is tagged as 'dev' + echo "tag=dev" >> $GITHUB_OUTPUT + echo "type=rolling" >> $GITHUB_OUTPUT + fi + + - name: Repository Dispatch + uses: peter-evans/repository-dispatch@v3 + with: + token: ${{ secrets.MAPCHETE_PAT_CONTAINER_IMAGES_TOKEN }} + repository: mapchete/container-images + event-type: source_update + client-payload: | + { + "source_repo": "${{ github.event.repository.name }}", + "image_tag": "${{ steps.vars.outputs.tag }}", + "type": "${{ steps.vars.outputs.type }}", + "sha": "${{ github.sha }}" + } \ No newline at end of file diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index cc405d3..e8c62e2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -7,7 +7,7 @@ on: branches: [main] schedule: - cron: '0 8 * * 1,4' - workflow_call: # This allows sync-dependencies.yml to trigger this logic + workflow_call: permissions: pull-requests: write @@ -20,18 +20,16 @@ jobs: fail-fast: false matrix: python-version: ["3.10", "3.11", "3.12", "3.13"] - os: ["ubuntu-latest"] # Simplified to ubuntu-latest for reliability + os: ["ubuntu-latest"] steps: - uses: actions/checkout@v4 - # --- CRITICAL FOR SYNC --- - name: Download updated dependencies uses: actions/download-artifact@v4 - continue-on-error: true # Safe to fail if running normally on push/PR + continue-on-error: true with: name: updated-deps - # ------------------------- - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 From e322f23573ce022d154b5f2c1e33fd438beba71c Mon Sep 17 00:00:00 2001 From: Scartography Date: Mon, 12 Jan 2026 17:21:28 +0100 Subject: [PATCH 2/2] use uv pip install as instruction for install --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 715796e..cbd9a39 100644 --- a/README.rst +++ b/README.rst @@ -40,10 +40,10 @@ You must have ``mapchete`` with ``s3`` installed, so let's grab the ``complete`` .. code-block:: bash - pip install mapchete[complete] + uv pip install mapchete[complete] Then install mapchete-eo: .. code-block:: bash - pip install mapchete-eo + uv pip install mapchete-eo