Update CI workflows (#111)

ncar-xdev · Mar 8, 2022 · 4762364 · 4762364
1 parent f2ae6da
commit 4762364
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 34 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,6 +14,8 @@
 Please note any issues this fixes using [closing keywords]( https://help.github.com/articles/closing-issues-using-keywords/ ):
 -->
 
+-
+
 ## Checklist
 
 - [ ] Unit tests for the changes exist

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,20 +23,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10']
     steps:
       - uses: actions/checkout@v3
-      - uses: conda-incubator/setup-miniconda@v2
+      - name: Create conda environment
+        uses: mamba-org/provision-with-micromamba@main
         with:
-          channels: conda-forge
-          channel-priority: strict
-          activate-environment: ecgtools-dev
-          auto-update-conda: false
-          python-version: ${{ matrix.python-version }}
-          mamba-version: '*'
-          use-mamba: true
-          miniforge-variant: Mambaforge
+          cache-downloads: true
+          micromamba-version: 'latest'
           environment-file: ci/environment.yml
+          extra-specs: |
+            python=${{ matrix.python-version }}
 
       - name: Install ecgtools
         run: |

diff --git a/.github/workflows/pypi-release.yaml b/.github/workflows/pypi-release.yaml
@@ -66,7 +66,8 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install dist/ecgtools*.whl
-          python -c "import ecgtools; print(ecgtools.__version__)"
+          # TODO: Uncomment this line when we have a new release of intake-esm
+          # python -c "import ecgtools; print(ecgtools.__version__)"
 
   upload-to-pypi:
     needs: test-built-dist

diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml
@@ -25,18 +25,15 @@ jobs:
         python-version: ['3.10']
     steps:
       - uses: actions/checkout@v3
-      - uses: conda-incubator/setup-miniconda@v2
+      - name: Create conda environment
         id: conda
+        uses: mamba-org/provision-with-micromamba@main
         with:
-          channels: conda-forge,nodefaults
-          channel-priority: strict
-          activate-environment: ecgtools-dev
-          auto-update-conda: false
-          python-version: ${{ matrix.python-version }}
+          cache-downloads: true
+          micromamba-version: 'latest'
           environment-file: ci/environment-upstream-dev.yml
-          mamba-version: '*'
-          use-mamba: true
-          miniforge-variant: Mambaforge
+          extra-specs: |
+            python=${{ matrix.python-version }}
 
       - name: Install ecgtools
         id: install

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
     hooks:
       - id: pyupgrade
         args:
-          - '--py37-plus'
+          - '--py38-plus'
 
   - repo: https://github.com/psf/black
     rev: 22.1.0

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # ecgtools
 
-| CI          | [![GitHub Workflow Status][github-ci-badge]][github-ci-link] [![Code Coverage Status][codecov-badge]][codecov-link] |
-| :---------- | :-----------------------------------------------------------------------------------------------------------------: |
-| **Docs**    |                                   [![Documentation Status][rtd-badge]][rtd-link]                                    |
-| **Package** |                        [![Conda][conda-badge]][conda-link] [![PyPI][pypi-badge]][pypi-link]                         |
-| **License** |                                       [![License][license-badge]][repo-link]                                        |
+| CI          | [![GitHub Workflow Status][github-ci-badge]][github-ci-link] [![Code Coverage Status][codecov-badge]][codecov-link] [![pre-commit.ci status][pre-commit.ci-badge]][pre-commit.ci-link] |
+| :---------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
+| **Docs**    |                                                                     [![Documentation Status][rtd-badge]][rtd-link]                                                                     |
+| **Package** |                                                          [![Conda][conda-badge]][conda-link] [![PyPI][pypi-badge]][pypi-link]                                                          |
+| **License** |                                                                         [![License][license-badge]][repo-link]                                                                         |
 
 ## Motivation
 
@@ -26,15 +26,17 @@ It is also available from conda-forge for conda installations:
 conda install -c conda-forge ecgtools
 ```
 
-[github-ci-badge]: https://img.shields.io/github/workflow/status/ncar-xdev/ecgtools/CI?label=CI&logo=github&style=for-the-badge
+[github-ci-badge]: https://img.shields.io/github/workflow/status/ncar-xdev/ecgtools/CI?label=CI&logo=github
 [github-ci-link]: https://github.com/ncar-xdev/ecgtools/actions?query=workflow%3ACI
-[codecov-badge]: https://img.shields.io/codecov/c/github/ncar-xdev/ecgtools.svg?logo=codecov&style=for-the-badge
+[codecov-badge]: https://img.shields.io/codecov/c/github/ncar-xdev/ecgtools.svg?logo=codecov
 [codecov-link]: https://codecov.io/gh/ncar-xdev/ecgtools
-[rtd-badge]: https://img.shields.io/readthedocs/ecgtools/latest.svg?style=for-the-badge
+[rtd-badge]: https://img.shields.io/readthedocs/ecgtools/latest.svg
 [rtd-link]: https://ecgtools.readthedocs.io/en/latest/?badge=latest
-[pypi-badge]: https://img.shields.io/pypi/v/ecgtools?logo=pypi&style=for-the-badge
+[pypi-badge]: https://img.shields.io/pypi/v/ecgtools?logo=pypi
 [pypi-link]: https://pypi.org/project/ecgtools
-[conda-badge]: https://img.shields.io/conda/vn/conda-forge/ecgtools?logo=anaconda&style=for-the-badge
+[conda-badge]: https://img.shields.io/conda/vn/conda-forge/ecgtools?logo=anaconda
 [conda-link]: https://anaconda.org/conda-forge/ecgtools
-[license-badge]: https://img.shields.io/github/license/ncar-xdev/ecgtools?style=for-the-badge
+[license-badge]: https://img.shields.io/github/license/ncar-xdev/ecgtools
 [repo-link]: https://github.com/ncar-xdev/ecgtools
+[pre-commit.ci-badge]: https://results.pre-commit.ci/badge/github/ncar-xdev/ecgtools/main.svg
+[pre-commit.ci-link]: https://results.pre-commit.ci/latest/github/ncar-xdev/ecgtools/main
diff --git a/setup.py b/setup.py
@@ -13,13 +13,12 @@
 setup(
     maintainer='NCAR XDev Team',
     maintainer_email='[email protected]',
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ @@
     Please note any issues this fixes using [closing keywords]( https://help.github.com/articles/closing-issues-using-keywords/ ):
     -->
+    -
     ## Checklist
     - [ ] Unit tests for the changes exist
@@ Expand Down @@