diff --git a/HISTORY.rst b/HISTORY.rst index 44b6fa6f..d0f13927 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,12 +1,20 @@ Version History =============== +v0.6.1 (2021-02-23) +------------------- +Bug Fixes +^^^^^^^^^ +* Add cf-xarray as dependency. This is a dependency of roocs-utils>=0.2.1 so is not a breaking change. +* Remove python-dateutil, fiona and geojson as dependencies, no longer needed. + v0.6.0 (2021-02-22) ------------------- Breaking Changes ^^^^^^^^^^^^^^^^ * New dev dependency: GitPython==3.1.12 +* roocs-utils>=0.2.1 required. New Features ^^^^^^^^^^^^ diff --git a/clisops/utils/output_utils.py b/clisops/utils/output_utils.py index 1ddf2ba1..b11d6871 100644 --- a/clisops/utils/output_utils.py +++ b/clisops/utils/output_utils.py @@ -231,7 +231,7 @@ def get_output(ds, output_type, output_dir, namer): writer = getattr(chunked_ds, format_writer) delayed_obj = writer(output_path, compute=False) - delayed_obj.compute() # TypeError: float() argument must be a string or a number, not 'cftime._cftime.Datetime360Day' + delayed_obj.compute() LOGGER.info(f"Wrote output file: {output_path}") return output_path diff --git a/docs/environment.yml b/docs/environment.yml index 96b560fd..6b32f2b9 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -12,16 +12,14 @@ dependencies: - numpy>=1.16 - xarray>=0.15 - pandas>=1.0.3 -- cftime>=1.0.4,<=1.3.1 +- cftime>=1.4.1 - netCDF4>=1.4 - xesmf>=0.5.2 - poppler>=0.67 -- fiona>=1.8 -- geojson>=2.5.0 - shapely>=1.6 - geopandas>=0.7 - dask>=2.6.0 - bottleneck>=1.3.1,<1.4 - pyproj>=2.5 -- python-dateutil>=2.8.1 - roocs-utils>=0.2.1 +- cf_xarray>=0.3.1 diff --git a/environment.yml b/environment.yml index 2adc429e..8e6b2ea1 100644 --- a/environment.yml +++ b/environment.yml @@ -7,19 +7,17 @@ dependencies: - numpy>=1.16 - xarray>=0.15 - pandas>=1.0.3 - - cftime>=1.0.4,<=1.3.1 + - cftime>=1.4.1 - netCDF4>=1.4 - poppler>=0.67 - - fiona>=1.8 - - geojson>=2.5.0 - shapely>=1.6 - geopandas>=0.7 - xesmf>=0.5.2 - dask>=2.6.0 - bottleneck>=1.3.1,<1.4 - pyproj>=2.5 - - python-dateutil>=2.8.1 - requests>=2.0 - roocs-utils>=0.2.1 + - cf_xarray>=0.3.1 # - pip: # - roocs-utils @ git+https://github.com/roocs/roocs-utils.git@master#egg=roocs-utils diff --git a/requirements.txt b/requirements.txt index e399d78f..b15df86c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,14 @@ numpy>=1.16 xarray>=0.15 pandas>=1.0.3 -cftime>=1.0.4,<=1.3.1 +cftime>=1.4.1 netCDF4>=1.4 -fiona>=1.8 -geojson>=2.5.0 shapely>=1.6 geopandas>=0.7 dask[complete]>=2.6 pyproj>=2.5 bottleneck~=1.3.1 -python-dateutil>=2.8.1 requests>=2.0 roocs-utils>=0.2.1 +cf-xarray>=0.3.1 # roocs-utils @ git+https://github.com/roocs/roocs-utils.git@master#egg=roocs-utils