Unpin funcy (#2470)

Revert "Temporarily pin funcy<2.0 for dvc fix (#2468)" This reverts commit 26f8a51.
GenericMappingTools · Apr 2, 2023 · aaa0ca0 · aaa0ca0
1 parent 1d8944f
commit aaa0ca0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
@@ -88,13 +88,12 @@ jobs:
           use-mamba: true
 
       # Install GMT and other required dependencies from conda-forge
-      # TODO: Remove funcy pin after next DVC release
       - name: Install dependencies
         run: |
           mamba install gmt=6.4.0 numpy=${{ matrix.numpy-version }} \
                         pandas xarray netCDF4 packaging \
                         ${{ matrix.optional-packages }} \
-                        build dvc 'funcy=1.18' make 'pytest>=6.0' \
+                        build dvc make 'pytest>=6.0' \
                         pytest-cov pytest-doctestplus pytest-mpl sphinx-gallery
 
       # Show installed pkg information for postmortem diagnostic

diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml
@@ -94,15 +94,14 @@ jobs:
           use-mamba: true
 
       # Install dependencies from conda-forge
-      # TODO: Remove funcy pin after next DVC release
       - name: Install dependencies
         run: |
           mamba install python=${{ matrix.python-version }} \
                         ninja cmake libblas libcblas liblapack fftw libgdal \
                         geopandas ghostscript libnetcdf hdf5 zlib curl pcre make
           pip install --pre --prefer-binary \
                         numpy pandas xarray netCDF4 packaging \
-                        build contextily dvc 'funcy=1.18' ipython rioxarray \
+                        build contextily dvc ipython rioxarray \
                         'pytest>=6.0' pytest-cov pytest-doctestplus pytest-mpl \
                         sphinx-gallery
 

diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml
@@ -62,13 +62,12 @@ jobs:
           use-mamba: true
 
       # Install GMT and other required dependencies from conda-forge
-      # TODO: Remove funcy pin after next DVC release
       - name: Install dependencies
         run: |
           mamba install gmt=${{ matrix.gmt_version }} numpy \
                         pandas xarray netCDF4 packaging \
                         contextily geopandas ipython rioxarray \
-                        build dvc 'funcy=1.18' make 'pytest>=6.0' \
+                        build dvc make 'pytest>=6.0' \
                         pytest-cov pytest-doctestplus pytest-mpl sphinx-gallery
 
       # Show installed pkg information for postmortem diagnostic