Remove compilers dependency from conda environment and force install …

…x64 git in OSX Github Action workflows (#2420)
ESMValGroup · May 15, 2024 · 7ce1a62 · 7ce1a62
1 parent 6786bd9
commit 7ce1a62
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/install-from-source.yml b/.github/workflows/install-from-source.yml
@@ -94,6 +94,8 @@ jobs:
         run: |
           mamba --version 2>&1 | tee source_install_osx_artifacts_python_${{ matrix.python-version }}/conda_version.txt
           python -V 2>&1 | tee source_install_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt
+      - name: Force install x64 git
+        run: mamba install -c conda-forge git
       - name: Install
         run: pip install -e .[develop] 2>&1 | tee source_install_osx_artifacts_python_${{ matrix.python-version }}/install.txt
       - name: Verify installation

diff --git a/.github/workflows/run-tests-monitor.yml b/.github/workflows/run-tests-monitor.yml
@@ -73,6 +73,7 @@ jobs:
       - run: mkdir -p test_osx_artifacts_python_${{ matrix.python-version }}
       - run: conda --version 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/conda_version.txt
       - run: python -V 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt
+      - run: mamba install -c conda-forge git
       - run: pip install pytest-monitor
       - run: pip install -e .[develop] 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
       - run: conda list

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -90,6 +90,7 @@ jobs:
       - run: mkdir -p test_osx_artifacts_python_${{ matrix.python-version }}
       - run: conda --version 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/conda_version.txt
       - run: python -V 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt
+      - run: mamba install -c conda-forge git
       - run: pip install -e .[develop] 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
       - run: conda list
       - run: flake8

diff --git a/environment.yml b/environment.yml
@@ -8,7 +8,6 @@ dependencies:
   - cartopy
   - cf-units
   - cftime
-  - compilers
   - dask
   - dask-jobqueue
   - distributed