Update README now that conda package is released

climate-resource · Jul 23, 2024 · 9052ff9 · 9052ff9
1 parent 4a0273e
commit 9052ff9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 43 deletions.
diff --git a/.github/workflows/install-conda.yaml b/.github/workflows/install-conda.yaml
@@ -20,11 +20,7 @@ jobs:
         os: ["ubuntu-latest", "macos-latest"]
         python-version: [ "3.9", "3.10", "3.11" ]
         # Check both 'library' install and the 'application' (i.e. locked) install
-        # While we wait for conda-forge release
-        # (https://github.com/conda-forge/staged-recipes/pull/26986)
-        # can only do non-locked install
-        # install-target: ["input4mips-validation", "input4mips-validation-locked"]
-        install-target: ["input4mips-validation"]
+        install-target: ["input4mips-validation", "input4mips-validation-locked"]
 
     steps:
     # While we wait for conda-forge release
@@ -37,32 +33,10 @@ jobs:
         create-args: >-
           python=${{ matrix.python-version }}
           -c conda-forge
-          pip
-          iris==3.8.1
-          netcdf4==1.7.1
-          numpy==1.26.4
-          cfchecker==4.1.0
-          attrs==23.2.0
-          cattrs==23.2.3
-          cf_xarray==0.9.4
-          loguru==0.7.2
-          ncdata==0.1.1
-          pandas==2.2.2
-          pint==0.24.3
-          pint-xarray==0.4
-          pooch==1.8.2
-          typer==0.12.3
-          validators==0.33.0
-          xarray==2024.6.0
+          "${{ matrix.install-target }}"
         init-shell: bash
     - name: Checkout repository
       uses: actions/checkout@v4
-    # While we wait for conda-forge release
-    # (https://github.com/conda-forge/staged-recipes/pull/26986)
-    # use pip for no-deps install
-    - name: No-deps install the package (temporary hack)
-      shell: bash -leo pipefail {0}
-      run: pip install --no-deps "${{ matrix.install-target }}"
     - name: Test installation
       shell: bash -leo pipefail {0}
       run: |

diff --git a/README.md b/README.md
@@ -41,21 +41,6 @@ This version pins the version of all dependencies too,
 which reduces the chance of installation issues
 because of breaking updates to dependencies.
 
-**Temporary workaround**
-
-While we [wait for input4mips-validation to be added to conda](https://github.com/conda-forge/staged-recipes/pull/26986),
-the locked version of input4mips-validation can be installed with conda/mamba with
-
-```sh
-# We recommend mamba, swap 'mamba' for 'conda' in the below if you want to use conda
-mamba create --name input4mips-validation
-mamba activate input4mips-validation
-mamba install -c conda-forge pip iris==3.8.1 netcdf4==1.7.1 numpy==1.26.4 cfchecker==4.1.0 attrs==23.2.0 cattrs==23.2.3 cf_xarray==0.9.4 loguru==0.7.2 ncdata==0.1.1 pandas==2.2.2 pint==0.24.3 pint-xarray==0.4 pooch==1.8.2 typer==0.12.3 validators==0.33.0 xarray==2024.6.0
-pip install --no-deps input4mips-validation
-```
-
-**End of temporary workaround**
-
 The locked version of input4mips-validation can be installed with
 
 ```sh