From 39239f6256821f888d30af45295a321403138cb9 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Wed, 1 Oct 2025 15:56:25 +0100 Subject: [PATCH 1/4] packaging: check pip/conda compatibility --- .github/workflows/test_conda-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test_conda-build.yml b/.github/workflows/test_conda-build.yml index 5b3e58f676..11b7cd2e71 100644 --- a/.github/workflows/test_conda-build.yml +++ b/.github/workflows/test_conda-build.yml @@ -5,6 +5,8 @@ on: paths: - 'conda-environment.yml' - '.github/workflows/test_conda-build.yml' + - 'pyproject.toml' + - 'setup.cfg' schedule: - cron: '17 22 * * 6' # Every Saturday at 22:17 workflow_dispatch: @@ -31,6 +33,7 @@ jobs: python-version: ['3.12', '3'] env: ENV_FILE: conda-environment.yml + PIP_NO_DEPS: True steps: - name: checkout cylc-flow uses: actions/checkout@v5 @@ -52,8 +55,13 @@ jobs: - name: check cylc installation shell: bash -el {0} run: | + # make sure Cylc is functioning conda run -n test cylc version --long + # make sure pip is happy with the packages installed + # (checks pip deps are compatible with conda deps) + conda run -n test pip check + - name: check for activate scripts shell : bash -el {0} run: | From 1e112dc6d8a6fd5b69037fb0a4c18fc4bfa68cf9 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Tue, 14 Oct 2025 15:46:39 +0100 Subject: [PATCH 2/4] Update .github/workflows/test_conda-build.yml Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> --- .github/workflows/test_conda-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_conda-build.yml b/.github/workflows/test_conda-build.yml index 11b7cd2e71..dbab8b9c8a 100644 --- a/.github/workflows/test_conda-build.yml +++ b/.github/workflows/test_conda-build.yml @@ -33,6 +33,7 @@ jobs: python-version: ['3.12', '3'] env: ENV_FILE: conda-environment.yml + # prevent pip from meddling with the conda installed dependencies (during the conda build step) PIP_NO_DEPS: True steps: - name: checkout cylc-flow From c91c4029cc740f3c9f747894ef9f0451c4fcc679 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Wed, 15 Oct 2025 16:31:57 +0100 Subject: [PATCH 3/4] actions: more reliable Python version pinning --- .github/workflows/test_conda-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_conda-build.yml b/.github/workflows/test_conda-build.yml index dbab8b9c8a..44683fbb5d 100644 --- a/.github/workflows/test_conda-build.yml +++ b/.github/workflows/test_conda-build.yml @@ -42,6 +42,7 @@ jobs: - name: modify conda env file run: | # write environment file + echo " - python = ${{ matrix.python-version }}" >> "$ENV_FILE" echo " - pip" >> "$ENV_FILE" # list pip as a dependency echo " - pip:" >> "$ENV_FILE" # add a pip section echo " - ." >> "$ENV_FILE" # install cylc-flow (pip install .) @@ -50,7 +51,6 @@ jobs: - name: build conda env uses: conda-incubator/setup-miniconda@v3 with: - python-version: ${{ matrix.python-version }} environment-file: ${{ env.ENV_FILE }} - name: check cylc installation From bfda2ee150d4007817c181930552bc5eb45ef8da Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Wed, 15 Oct 2025 17:26:16 +0100 Subject: [PATCH 4/4] conda: bump dependency missed in earlier PR --- conda-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-environment.yml b/conda-environment.yml index 9ec1a968d0..b99a9af64d 100644 --- a/conda-environment.yml +++ b/conda-environment.yml @@ -12,7 +12,7 @@ dependencies: - metomi-isodatetime >=1!3.0.0, <1!3.2.0 - packaging # Constrain protobuf version for compatible Scheduler-UIS comms across hosts - - protobuf >=4.24.4,<4.25.0 + - protobuf >=5,<8 - psutil >=5.6.0 - python - pyzmq >=22