Merge pull request Unidata#3839 from dopplershift/fix-dependabot-again

Fix dependabot again

Author: dcamron

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/vscode/devcontainers/miniconda:latest
 
-COPY ci/*.txt ci/dev/*.txt /tmp/conda-tmp/
+COPY ci/*.txt ci-dev/*.txt /tmp/conda-tmp/
 RUN sed -i -e "s/scipy==.*/scipy==1.5.3/" /tmp/conda-tmp/requirements.txt
 RUN /opt/conda/bin/conda config --add channels conda-forge
 RUN /opt/conda/bin/conda config --set channel_priority strict

.github/actions/install-conda/action.yml

@@ -31,7 +31,7 @@ runs:
 
     - name: Install dependencies
       shell: bash -l {0}
-      run: micromamba install --yes --file ci/dev/${{ inputs.type }}_requirements.txt --file ci/extra_requirements.txt --file ci/requirements.txt
+      run: micromamba install --yes --file ci-dev/${{ inputs.type }}_requirements.txt --file ci/extra_requirements.txt --file ci/requirements.txt
 
     - name: Download Cartopy Maps
       if: ${{ inputs.need-cartopy == 'true' }}

.github/actions/install-pypi/action.yml

@@ -33,7 +33,7 @@ runs:
         python-version: ${{ inputs.python-version }}
         cache: 'pip'
         cache-dependency-path: |
-          ci/dev/${{ inputs.type }}_requirements.txt
+          ci-dev/${{ inputs.type }}_requirements.txt
           ci/${{ inputs.version-file }}
           ci/extra_requirements.txt
 
@@ -68,14 +68,14 @@ runs:
       shell: bash
       run: >
         python -m pip install .[${{ env.DEP_GROUPS }}]
-        -c ci/${{ inputs.version-file }} -c ci/dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt
+        -c ci/${{ inputs.version-file }} -c ci-dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt
 
     - name: Install additional test tools
       if: ${{ inputs.type == 'test' }}
       shell: bash
       run: >
         python -m pip install coverage
-        -c ci/${{ inputs.version-file }} -c ci/dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt
+        -c ci/${{ inputs.version-file }} -c ci-dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt
 
     - name: Download Cartopy Maps
       if: ${{ inputs.need-cartopy == 'true' }}

.github/dependabot.yml

@@ -10,6 +10,8 @@ updates:
     ignore:
       - dependency-name: "boto3"
         update-types: ["version-update:semver-patch"]
+      - dependency-name: "cartopy"
+        versions: ["0.24.1"]
     open-pull-requests-limit: 10
     pull-request-branch-name:
       separator: "-"
@@ -27,7 +29,7 @@ updates:
 
   # PyPI updates for dev tools
   - package-ecosystem: pip
-    directory: "/ci/dev"
+    directory: "/ci-dev"
     schedule:
       interval: weekly
     # We don't need to worry about updating to every patch release of dev tools

.github/workflows/linting.yml

@@ -23,10 +23,10 @@ jobs:
         with:
           python-version: 3.x
           cache: 'pip'
-          cache-dependency-path: 'ci/dev/linting_requirements.txt'
+          cache-dependency-path: 'ci-dev/linting_requirements.txt'
 
       - name: Install linting tools
-        run: python -m pip install -r ci/dev/linting_requirements.txt
+        run: python -m pip install -r ci-dev/linting_requirements.txt
 
       - name: Set up reviewdog
         uses: reviewdog/action-setup@v1

.github/workflows/tests-pypi.yml

@@ -59,10 +59,10 @@ jobs:
         opt_deps = config['optional-dependencies']
 
         # Generate a Minimum dependency file
-        for src, fname in [(config['dependencies'], 'requirements.txt'),
-                           (opt_deps['test'], 'dev/test_requirements.txt'),
-                           (opt_deps['extras'], 'extra_requirements.txt')]:
-          with (Path('ci') / fname).open('wt') as out:
+        for src, fname in [(config['dependencies'], 'ci/requirements.txt'),
+                           (opt_deps['test'], 'ci-dev/test_requirements.txt'),
+                           (opt_deps['extras'], 'ci/extra_requirements.txt')]:
+          with Path(fname).open('wt') as out:
             for dep in src:
               dep = dep.split(';')[0]
               out.write(dep.replace('>=', '==') + '\n')

.github/workflows/unstable-builds.yml

@@ -25,8 +25,8 @@ jobs:
 
     - name: Assemble test requirements
       run: |
-        echo git+https://github.com/hgrecco/pint@master#egg=pint >> ci/dev/test_requirements.txt
-        echo git+https://github.com/pydata/xarray@main#egg=xarray >> ci/dev/test_requirements.txt
+        echo git+https://github.com/hgrecco/pint@master#egg=pint >> ci-dev/test_requirements.txt
+        echo git+https://github.com/pydata/xarray@main#egg=xarray >> ci-dev/test_requirements.txt
 
     - name: Install using PyPI
       uses: ./.github/actions/install-pypi
@@ -67,8 +67,8 @@ jobs:
 
     - name: Assemble doc requirements
       run: |
-        echo git+https://github.com/hgrecco/pint@master#egg=pint >> ci/dev/doc_requirements.txt
-        echo git+https://github.com/pydata/xarray@main#egg=xarray >> ci/dev/doc_requirements.txt
+        echo git+https://github.com/hgrecco/pint@master#egg=pint >> ci-dev/doc_requirements.txt
+        echo git+https://github.com/pydata/xarray@main#egg=xarray >> ci-dev/doc_requirements.txt
 
     - name: Install using PyPI
       uses: ./.github/actions/install-pypi

CONTRIBUTING.md

@@ -130,7 +130,7 @@ Install the necessary dependency packages from conda-forge.
 Remember that these must be executed within the ``metpy`` directory.
 
 ```sh
-conda install --file ci/requirements.txt --file ci/extra_requirements.txt --file ci/dev/test_requirements.txt
+conda install --file ci/requirements.txt --file ci/extra_requirements.txt --file ci-dev/test_requirements.txt
 ```
 
 Finally, create an editable install of MetPy that will update with your development!
@@ -204,7 +204,7 @@ your feature is more complex, consider adding to the examples or tutorials for M
 You can build the documentation locally to see how your changes will look.
 After setting up your [development environment](#setting-up-your-development-environment) above,
 from within the ``metpy`` directory with your ``devel`` environment active,
-use ``conda install --file ci/dev/doc_requirements.txt``
+use ``conda install --file ci-dev/doc_requirements.txt``
 to install required packages to build our documentation.
 Then, still from within your ``devel`` environment,
 
@@ -343,7 +343,7 @@ locally within the source directory you can use the [ruff](https://docs.astral.s
 After setting up your [development environment](#setting-up-your-development-environment) above,
 from within the ``metpy`` directory with your ``devel`` environment active,
 install the code style tools we use with
-``conda install --file ci/dev/linting_requirements.txt``. Checking your code style is then as
+``conda install --file ci-dev/linting_requirements.txt``. Checking your code style is then as
 easy as running ``ruff check . ; flake8 .`` in the base of the repository.
 
 You can also just submit your PR and the kind robots will comment on all style violations as