Merge branch 'master' of https://github.com/xgcm/xhistogram into pin-…

…dask

.github/workflows/linting.yml

@@ -0,0 +1,12 @@
+name: Linting
+
+on: [push, pull_request]
+
+jobs:
+  checks:
+    name: pre-commit hooks
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/[email protected]

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+repos:
+-   repo: https://github.com/psf/black
+    rev: 20.8b1
+    hooks:
+    - id: black
+      language_version: python3
+      exclude: versioneer.py
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.0
+    hooks:
+    - id: flake8
+      language_version: python3

.travis.yml

@@ -13,6 +13,12 @@ matrix:
     env: CONDA_ENV="ci/environment-py36-numpy1.17.yml" DOCTEST=false
   - python: 3.6
     env: CONDA_ENV="ci/environment-py36.yml" DOCTEST=false
+  - python: 3.7
+    env: CONDA_ENV="ci/environment-py37.yml" DOCTEST=false
+  - python: 3.8
+    env: CONDA_ENV="ci/environment-py38.yml" DOCTEST=false
+  - python: 3.8
+    env: CONDA_ENV="ci/environment-py38-upstream.yml" DOCTEST=false
   - python: 3.6
     env: CONDA_ENV="doc/environment.yml" DOCTEST=true
 

README.rst

@@ -1,7 +1,7 @@
 xhistogram: Fast, flexible, label-aware histograms for numpy and xarray
 =======================================================================
 
-|pypi| |conda forge| |Build Status| |codecov| |docs| |license|
+|pypi| |conda forge| |Build Status| |codecov| |docs| |linting| |license|
 
 For more information, including installation instructions, read the full
 `xhistogram documentation`_.
@@ -28,6 +28,9 @@ For more information, including installation instructions, read the full
 .. |docs| image:: http://readthedocs.org/projects/xhistogram/badge/?version=latest
    :target: http://xhistogram.readthedocs.org/en/stable/?badge=latest
    :alt: documentation status
+.. |linting| image:: https://github.com/xgcm/xhistogram/actions/workflows/linting.yml/badge.svg
+   :target: https://github.com/xgcm/xhistogram/actions/workflows/linting.yml
+   :alt: linting status
 .. |license| image:: https://img.shields.io/github/license/mashape/apistatus.svg
    :target: https://github.com/xgcm/xhistogram
    :alt: license

ci/environment-py37.yml

@@ -0,0 +1,11 @@
+name: xhistogram_test_env
+dependencies:
+  - python=3.7
+  - xarray
+  - dask
+  - numpy
+  - pytest
+  - pip
+  - pip:
+    - codecov
+    - pytest-cov

ci/environment-py38-upstream.yml

@@ -0,0 +1,11 @@
+name: xhistogram_test_env
+dependencies:
+  - python=3.8
+  - numpy
+  - pytest
+  - pip
+  - pip:
+    - git+https://github.com/dask/dask.git
+    - git+https://github.com/pydata/xarray.git
+    - codecov
+    - pytest-cov

ci/environment-py38.yml

@@ -0,0 +1,11 @@
+name: xhistogram_test_env
+dependencies:
+  - python=3.8
+  - xarray
+  - dask
+  - numpy
+  - pytest
+  - pip
+  - pip:
+    - codecov
+    - pytest-cov