From c53fea67ab8ed4cb47dac625301454433c9eab09 Mon Sep 17 00:00:00 2001 From: Ryan Abernathey Date: Thu, 22 Aug 2019 23:36:44 -0700 Subject: [PATCH] Minor cleanup for 0.1.1 release (#11) * update whats new * update ci config to include other numpy versions * Update environment-py36-numpy1.17.yml --- .travis.yml | 4 ++++ ci/environment-py36-numpy1.16.yml | 10 ++++++++++ ci/environment-py36-numpy1.17.yml | 12 ++++++++++++ ci/environment-py36.yml | 2 +- doc/contributing.rst | 11 +++++++++++ 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ci/environment-py36-numpy1.16.yml create mode 100644 ci/environment-py36-numpy1.17.yml diff --git a/.travis.yml b/.travis.yml index 507c5e9..2ae39ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,10 @@ notifications: matrix: fast_finish: true include: + - python: 3.6 + env: CONDA_ENV="ci/environment-py36-numpy1.16.yml" DOCTEST=false + - python: 3.6 + 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.6 diff --git a/ci/environment-py36-numpy1.16.yml b/ci/environment-py36-numpy1.16.yml new file mode 100644 index 0000000..f0bd0cb --- /dev/null +++ b/ci/environment-py36-numpy1.16.yml @@ -0,0 +1,10 @@ +name: xhistogram_test_env +dependencies: + - python=3.6 + - xarray + - dask + - numpy==1.16 + - pytest + - pip: + - codecov + - pytest-cov diff --git a/ci/environment-py36-numpy1.17.yml b/ci/environment-py36-numpy1.17.yml new file mode 100644 index 0000000..02f9957 --- /dev/null +++ b/ci/environment-py36-numpy1.17.yml @@ -0,0 +1,12 @@ +name: xhistogram_test_env +channels: + - conda-forge +dependencies: + - python=3.6 + - xarray + - dask + - numpy==1.17 + - pytest + - pip: + - codecov + - pytest-cov diff --git a/ci/environment-py36.yml b/ci/environment-py36.yml index 72e4c28..7ea9d32 100644 --- a/ci/environment-py36.yml +++ b/ci/environment-py36.yml @@ -3,7 +3,7 @@ dependencies: - python=3.6 - xarray - dask - - numpy>=1.16 + - numpy - pytest - pip: - codecov diff --git a/doc/contributing.rst b/doc/contributing.rst index 673a444..cc351d3 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -8,6 +8,17 @@ GitHub repo: `https://github.com/xgcm/xhistogram `_. +- Fixed issue :issue:`5` related to incorrect dimension order + and dropping of dimension coordinates. + By `Ryan Abernathey `_. + v0.1 ~~~~