From 1c340982b67671c771612c4d090aa68f0a5611a0 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Wed, 7 Oct 2020 12:33:15 -0500 Subject: [PATCH 1/3] attempt to fix py27 with old zarr --- ci/environment-py2.7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/environment-py2.7.yml b/ci/environment-py2.7.yml index aae7a87d..825a2ebf 100644 --- a/ci/environment-py2.7.yml +++ b/ci/environment-py2.7.yml @@ -7,7 +7,7 @@ dependencies: - pytest - future - cftime - - zarr + - zarr<=2.3.2 - pip: - cachetools - codecov From d02e041f2192c28581cc17f9e55fd076902ffab5 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Wed, 7 Oct 2020 12:46:33 -0500 Subject: [PATCH 2/3] alternate soln with setup --- ci/environment-py2.7.yml | 2 +- setup.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/environment-py2.7.yml b/ci/environment-py2.7.yml index 825a2ebf..aae7a87d 100644 --- a/ci/environment-py2.7.yml +++ b/ci/environment-py2.7.yml @@ -7,7 +7,7 @@ dependencies: - pytest - future - cftime - - zarr<=2.3.2 + - zarr - pip: - cachetools - codecov diff --git a/setup.py b/setup.py index 1540fdf1..2ca55e8b 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,8 @@ INSTALL_REQUIRES = ['xarray >= 0.10.1', 'dask >= 1.0', 'cachetools'] SETUP_REQUIRES = ['pytest-runner'] TESTS_REQUIRE = ['pytest >= 4.0', 'coverage'] +if sys.version_info < (2,7): + TESTS_REQUIRE+=['zarr<=2.3.2'] DESCRIPTION = "Read MITgcm mds binary files into xarray" def readme(): From 6ba00d4c2a1dab093e0903e64092074dbf985ede Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Wed, 7 Oct 2020 12:52:14 -0500 Subject: [PATCH 3/3] didn't work, back to first soln --- ci/environment-py2.7.yml | 2 +- setup.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/environment-py2.7.yml b/ci/environment-py2.7.yml index aae7a87d..825a2ebf 100644 --- a/ci/environment-py2.7.yml +++ b/ci/environment-py2.7.yml @@ -7,7 +7,7 @@ dependencies: - pytest - future - cftime - - zarr + - zarr<=2.3.2 - pip: - cachetools - codecov diff --git a/setup.py b/setup.py index 2ca55e8b..1540fdf1 100644 --- a/setup.py +++ b/setup.py @@ -30,8 +30,6 @@ INSTALL_REQUIRES = ['xarray >= 0.10.1', 'dask >= 1.0', 'cachetools'] SETUP_REQUIRES = ['pytest-runner'] TESTS_REQUIRE = ['pytest >= 4.0', 'coverage'] -if sys.version_info < (2,7): - TESTS_REQUIRE+=['zarr<=2.3.2'] DESCRIPTION = "Read MITgcm mds binary files into xarray" def readme():