From d582eeac98698ba54dd0ee8d58b5d6b3c89a5c56 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 28 Jul 2025 09:18:58 +0200 Subject: [PATCH 1/2] Remove conda default channel --- .github/workflows/deploy.yml | 7 ++- .github/workflows/pipeline.yml | 94 ++++++++++++++-------------------- 2 files changed, 42 insertions(+), 59 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9ed34ded..8b95c221 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,13 +19,12 @@ jobs: id-token: write steps: - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: "3.13" miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-openmpi.yml - name: Build shell: bash -l {0} diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 59420739..46e79ad6 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -62,13 +62,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: "3.13" miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-mini.yml - name: Test shell: bash -l {0} @@ -83,13 +82,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: '3.13' miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-openmpi.yml - name: Setup shell: bash -l {0} @@ -116,13 +114,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: ${{ matrix.python-version }} miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: ${{ matrix.environment-file }} - name: Test shell: bash -l {0} @@ -149,13 +146,13 @@ jobs: run: | cp binder/environment.yml environment.yml tail --lines=+4 .ci_support/environment-notebooks.yml >> environment.yml - echo -e "channels:\n - conda-forge\n" > .condarc - name: Setup Mambaforge - uses: conda-incubator/setup-miniconda@v3 + uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: "3.12" miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: environment.yml - name: Install shell: bash -l {0} @@ -174,15 +171,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Merge Notebook environment - run: | - echo -e "channels:\n - conda-forge\n" > .condarc - name: Setup Mambaforge - uses: conda-incubator/setup-miniconda@v3 + uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: "3.12" miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-integration.yml - name: Install shell: bash -l {0} @@ -205,12 +200,12 @@ jobs: run: | echo -e '- coverage\n- flux-core =0.59.0'>> .ci_support/environment-mpich.yml cat .ci_support/environment-mpich.yml - echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: '3.12' miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-mpich.yml - name: Test shell: bash -l {0} @@ -236,12 +231,12 @@ jobs: run: | echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0' >> .ci_support/environment-openmpi.yml cat .ci_support/environment-openmpi.yml - echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: '3.12' miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-openmpi.yml - name: Test shell: bash -l {0} @@ -282,14 +277,12 @@ jobs: timeout-minutes: 5 - name: ubnuntu install run: sudo apt install -y mpich - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: '3.13' miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-mpich.yml - name: Test shell: bash -l {0} @@ -322,14 +315,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: ${{ matrix.python-version }} miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-mpich.yml - name: Test shell: bash -l {0} @@ -359,14 +350,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: ${{ matrix.python-version }} miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-openmpi.yml - name: Test shell: bash -l {0} @@ -381,14 +370,12 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: "3.13" miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-win.yml - name: Test shell: bash -l {0} @@ -403,13 +390,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: '3.10' miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" environment-file: .ci_support/environment-old.yml - name: Test shell: bash -l {0} @@ -442,14 +428,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: "3.13" miniforge-version: latest - condarc-file: .condarc + channels: conda-forge + conda-remove-defaults: "true" - name: Generate UML diagram shell: bash -l {0} timeout-minutes: 10 From 93ba29cb501686aa3863a6ee8cb9c4db4f15435e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Mon, 28 Jul 2025 19:35:01 +0200 Subject: [PATCH 2/2] downgrade to v3 --- .github/workflows/deploy.yml | 2 +- .github/workflows/pipeline.yml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b95c221..b31df386 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: id-token: write steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: "3.13" miniforge-version: latest diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 46e79ad6..84d3227c 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -62,7 +62,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: "3.13" miniforge-version: latest @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.13' miniforge-version: latest @@ -114,7 +114,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} miniforge-version: latest @@ -147,7 +147,7 @@ jobs: cp binder/environment.yml environment.yml tail --lines=+4 .ci_support/environment-notebooks.yml >> environment.yml - name: Setup Mambaforge - uses: conda-incubator/setup-miniconda@v3.2.0 + uses: conda-incubator/setup-miniconda@v3 with: python-version: "3.12" miniforge-version: latest @@ -172,7 +172,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup Mambaforge - uses: conda-incubator/setup-miniconda@v3.2.0 + uses: conda-incubator/setup-miniconda@v3 with: python-version: "3.12" miniforge-version: latest @@ -200,7 +200,7 @@ jobs: run: | echo -e '- coverage\n- flux-core =0.59.0'>> .ci_support/environment-mpich.yml cat .ci_support/environment-mpich.yml - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.12' miniforge-version: latest @@ -231,7 +231,7 @@ jobs: run: | echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0' >> .ci_support/environment-openmpi.yml cat .ci_support/environment-openmpi.yml - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.12' miniforge-version: latest @@ -277,7 +277,7 @@ jobs: timeout-minutes: 5 - name: ubnuntu install run: sudo apt install -y mpich - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.13' miniforge-version: latest @@ -315,7 +315,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} miniforge-version: latest @@ -350,7 +350,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} miniforge-version: latest @@ -370,7 +370,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: "3.13" miniforge-version: latest @@ -390,7 +390,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.10' miniforge-version: latest @@ -428,7 +428,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3.2.0 + - uses: conda-incubator/setup-miniconda@v3 with: python-version: "3.13" miniforge-version: latest