Merge branch 'main' into loader/torch

Author: Joe Hamman

.github/workflows/main.yaml

@@ -9,27 +9,20 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/[email protected]
-      - uses: actions/[email protected]
-      - uses: pre-commit/[email protected]
-
   test:
     name: ${{ matrix.python-version }}-build
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.7, 3.8, 3.9]
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.4.0
       - name: Setup Python
-        uses: actions/setup-python@v2.2.2
+        uses: actions/setup-python@v2.3.2
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
-      - uses: actions/[email protected].6
+      - uses: actions/[email protected].7
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/dev-requirements.txt') }}
@@ -41,7 +34,13 @@ jobs:
           python -m pip list
       - name: Running Tests
         run: |
-          python -m pytest --verbose
+          py.test --verbose --cov=. --cov-report=xml
+      - name: Upload coverage to Codecov
+        uses: codecov/[email protected]
+        if: ${{ matrix.python-version }} == 3.9
+        with:
+          file: ./coverage.xml
+          fail_ci_if_error: false
 
   test-upstream:
     name: ${{ matrix.python-version }}-dev-build
@@ -50,13 +49,13 @@ jobs:
       matrix:
         python-version: [3.8, 3.9]
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.4.0
       - name: Setup Python
-        uses: actions/setup-python@v2.2.2
+        uses: actions/setup-python@v2.3.2
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
-      - uses: actions/[email protected].6
+      - uses: actions/[email protected].7
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/dev-requirements.txt') }}
@@ -71,4 +70,4 @@ jobs:
           python -m pip list
       - name: Running Tests
         run: |
-          python -m pytest --verbose
+          py.test --verbose --cov=.

.pre-commit-config.yaml

@@ -1,6 +1,10 @@
+ci:
+  autoupdate_schedule: quarterly
+  autofix_prs: false
+
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -9,27 +13,27 @@ repos:
       - id: check-yaml
       - id: double-quote-string-fixer
 
-  - repo: https://github.com/ambv/black
-    rev: 21.5b2
+  - repo: https://github.com/psf/black
+    rev: 21.12b0
     hooks:
       - id: black
         args: ["--line-length", "80", "--skip-string-normalization"]
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/seed-isort-config
     rev: v2.2.0
     hooks:
       - id: seed-isort-config
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.8.0
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.10.1
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.2.0
+    rev: v2.5.1
     hooks:
       - id: prettier
         language_version: system

README.rst

@@ -1,7 +1,7 @@
 xbatcher: Batch Generation from Xarray Datasets
 ===============================================
 
-|Build Status| |codecov| |docs| |license|
+|Build Status| |codecov| |docs| |pypi| |license|
 
 
 Xbatcher is a small library for iterating xarray DataArrays in batches. The
@@ -19,6 +19,10 @@ such as Keras_. View the |docs| for more info.
    :alt: code coverage
 .. |docs| image:: http://readthedocs.org/projects/xbatcher/badge/?version=latest
    :target: http://xbatcher.readthedocs.org/en/latest/?badge=latest
+   :alt: docs
+.. |pypi| image:: https://img.shields.io/pypi/v/xbatcher.svg
+   :target: https://pypi.python.org/pypi/xbatcher
+   :alt: pypi
 .. |license| image:: https://img.shields.io/github/license/mashape/apistatus.svg
    :target: https://github.com/pangeo-data/xbatcher
    :alt: license

dev-requirements.txt

@@ -1,4 +1,6 @@
 pytest
 torch
 coverage
+pytest-cov
+adlfs
 -r requirements.txt