Merge pull request #1483 from jthielen/cartopy-to-pyproj-calc

Use PyProj instead of Cartopy for internal coordinate transforms and rename crs coordinate

Author: dopplershift

.github/workflows/docs.yml

@@ -98,7 +98,7 @@ jobs:
 
     - name: Enable linkchecker for PRs
       if: ${{ github.event_name == 'pull_request' && matrix.check-links == true }}
-      run: echo "::set-env name=LINKCHECKER::linkcheck"
+      run: echo "LINKCHECKER=linkcheck" >> $GITHUB_ENV
 
     - name: Build docs
       run: |
@@ -120,7 +120,7 @@ jobs:
     # branch that's not master (which is confined to n.nn.x above) or on a tag.
     - name: Set doc version
       if: ${{ github.event_name != 'push' || !contains(github.ref, 'master') }}
-      run: echo "::set-env name=DOC_VERSION::v$(python -c 'import metpy; print(metpy.__version__.rsplit(".", maxsplit=2)[0])')"
+      run: echo "DOC_VERSION=v$(python -c 'import metpy; print(metpy.__version__.rsplit(".", maxsplit=2)[0])')" >> $GITHUB_ENV
 
     - name: Upload to GitHub Pages
       if: ${{ github.event_name != 'pull_request' && matrix.experimental == false }}

.github/workflows/linting.yml

@@ -25,7 +25,7 @@ jobs:
           curl -sfL \
             https://github.com/reviewdog/reviewdog/raw/master/install.sh | \
               sh -s -- -b $HOME/bin
-          echo ::add-path::$HOME/bin
+          echo "$HOME/bin" >> $GITHUB_PATH
 
       - name: Run flake8
         env:

.github/workflows/tests-conda.yml

@@ -108,6 +108,7 @@ jobs:
         path: test_output/
 
     - name: Upload coverage
+      if: ${{ always() }}
       uses: codecov/codecov-action@v1
       with:
         name: conda-${{ matrix.python-version }}-${{ runner.os }}

.github/workflows/tests-pypi.yml

@@ -126,6 +126,7 @@ jobs:
         path: test_output/
 
     - name: Upload coverage
+      if: ${{ always() }}
       uses: codecov/codecov-action@v1
       with:
         name: pypi-${{ matrix.python-version }}-${{ matrix.dep-versions }}-${{ matrix.no-extras }}-${{ runner.os }}

.travis.yml

@@ -88,7 +88,7 @@ script:
     fi
 
 after_script:
-  - if [[ $TASK != "coverage" ]]; then
+  - if [[ $TASK == "coverage" ]]; then
       pip install codecov codacy-coverage;
       coverage xml;
       codecov -X gcov -f coverage.xml -e TRAVIS_PYTHON_VERSION;

ci/Current.txt

@@ -1,10 +1,11 @@
+importlib_metadata==2.0.0
+importlib_resources==3.0.0
 matplotlib==3.3.2
 numpy==1.19.1
-scipy==1.5.2
+pandas==1.1.3
+pooch==1.2.0
 pint==0.16.1
-xarray==0.16.1
+pyproj==2.6.1.post1
+scipy==1.5.2
 traitlets==4.3.3
-pooch==1.2.0
-pandas==1.1.3
-importlib_metadata==2.0.0
-importlib_resources==3.0.0
+xarray==0.16.1

ci/Minimum

@@ -1,10 +1,11 @@
+importlib_metadata==1.0.0
+importlib_resources==1.3.0
 matplotlib==2.1.0
 numpy==1.16.0
-scipy==1.0.0
+pandas==0.22.0
 pint==0.10.1
-xarray==0.14.1
-traitlets==4.3.0
 pooch==0.1
-pandas==0.22.0
-importlib_metadata==1.0.0
-importlib_resources==1.3.0
+pyproj==2.3.0
+scipy==1.0.0
+traitlets==4.3.0
+xarray==0.14.1

ci/Prerelease

@@ -1,6 +1,7 @@
 matplotlib>=0.0.dev0
 numpy>=0.0.dev0
-scipy>=0.0.dev0
-traitlets>=0.0.dev0
 pooch>=0.0.dev0
 pandas>=0.0.dev0
+pyproj>=0.0.dev0
+scipy>=0.0.dev0
+traitlets>=0.0.dev0

ci/extra_requirements.txt

@@ -1,2 +1 @@
 cartopy==0.18.0
-pyproj==2.6.1.post1

conftest.py

@@ -10,6 +10,7 @@
 import numpy
 import pandas
 import pooch
+import pyproj
 import pytest
 import scipy
 import traitlets
@@ -25,10 +26,10 @@
 def pytest_report_header(config, startdir):
     """Add dependency information to pytest output."""
     return (f'Dep Versions: Matplotlib {matplotlib.__version__}, '
-            f'NumPy {numpy.__version__}, SciPy {scipy.__version__}, '
-            f'Xarray {xarray.__version__}, Pint {pint.__version__}, '
-            f'Pandas {pandas.__version__}, Traitlets {traitlets.__version__}, '
-            f'Pooch {pooch.version.full_version}')
+            f'NumPy {numpy.__version__}, Pandas {pandas.__version__}, '
+            f'Pint {pint.__version__}, Pooch {pooch.version.full_version}\n'
+            f'\tPyProj {pyproj.__version__}, SciPy {scipy.__version__}, '
+            f'Traitlets {traitlets.__version__}, Xarray {xarray.__version__}')
 
 
 @pytest.fixture(autouse=True)
@@ -45,6 +46,7 @@ def ccrs():
 
     Any testing function/fixture that needs access to ``cartopy.crs`` can simply add this to
     their parameter list.
+
     """
     return pytest.importorskip('cartopy.crs')
 
@@ -55,15 +57,14 @@ def cfeature():
 
     Any testing function/fixture that needs access to ``cartopy.feature`` can simply add this
     to their parameter list.
+
     """
     return pytest.importorskip('cartopy.feature')
 
 
 @pytest.fixture()
 def test_da_lonlat():
     """Return a DataArray with a lon/lat grid and no time coordinate for use in tests."""
-    pytest.importorskip('cartopy')
-
     data = numpy.linspace(300, 250, 3 * 4 * 4).reshape((3, 4, 4))
     ds = xarray.Dataset(
         {'temperature': (['isobaric', 'lat', 'lon'], data)},
@@ -96,8 +97,6 @@ def test_da_lonlat():
 @pytest.fixture()
 def test_da_xy():
     """Return a DataArray with a x/y grid and a time coordinate for use in tests."""
-    pytest.importorskip('cartopy')
-
     data = numpy.linspace(300, 250, 3 * 3 * 4 * 4).reshape((3, 3, 4, 4))
     ds = xarray.Dataset(
         {'temperature': (['time', 'isobaric', 'y', 'x'], data),