From 38bc38577095f3be7e01850fa7067f739e7f9f19 Mon Sep 17 00:00:00 2001 From: Eleanor Smith Date: Tue, 23 Feb 2021 08:44:57 +0000 Subject: [PATCH 1/4] comment out not needed dependencies --- HISTORY.rst | 8 ++++++++ clisops/utils/output_utils.py | 2 +- docs/environment.yml | 12 ++++++------ environment.yml | 12 ++++++------ requirements.txt | 12 ++++++------ 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 44b6fa6f..a95f054d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,12 +1,20 @@ Version History =============== +v0.6.1 (2021-02-22) +------------------- +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, netCDF4, fiona, geopandas and bottleneck 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..7891b534 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -12,16 +12,16 @@ dependencies: - numpy>=1.16 - xarray>=0.15 - pandas>=1.0.3 -- cftime>=1.0.4,<=1.3.1 -- netCDF4>=1.4 +- cftime>=1.4.1 +#- netCDF4>=1.4 - xesmf>=0.5.2 - poppler>=0.67 -- fiona>=1.8 -- geojson>=2.5.0 +#- fiona>=1.8 +#- geojson>=2.5.0 - shapely>=1.6 - geopandas>=0.7 - dask>=2.6.0 -- bottleneck>=1.3.1,<1.4 +#- 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..a981b011 100644 --- a/environment.yml +++ b/environment.yml @@ -7,19 +7,19 @@ dependencies: - numpy>=1.16 - xarray>=0.15 - pandas>=1.0.3 - - cftime>=1.0.4,<=1.3.1 - - netCDF4>=1.4 + - cftime>=1.4.1 +# - netCDF4>=1.4 - poppler>=0.67 - - fiona>=1.8 +# - fiona>=1.8 - geojson>=2.5.0 - shapely>=1.6 - - geopandas>=0.7 +# - geopandas>=0.7 - xesmf>=0.5.2 - dask>=2.6.0 - - bottleneck>=1.3.1,<1.4 +# - 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..1374ddf1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ numpy>=1.16 xarray>=0.15 pandas>=1.0.3 -cftime>=1.0.4,<=1.3.1 -netCDF4>=1.4 -fiona>=1.8 +cftime>=1.4.1 +# netCDF4>=1.4 +# fiona>=1.8 geojson>=2.5.0 shapely>=1.6 -geopandas>=0.7 +# geopandas>=0.7 dask[complete]>=2.6 pyproj>=2.5 -bottleneck~=1.3.1 -python-dateutil>=2.8.1 +# bottleneck~=1.3.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 From 0ec0d242d2837c07a5af7f99064862a84cc0382f Mon Sep 17 00:00:00 2001 From: Eleanor Smith Date: Tue, 23 Feb 2021 08:56:21 +0000 Subject: [PATCH 2/4] add some dependencies back in --- docs/environment.yml | 2 +- environment.yml | 6 +++--- requirements.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index 7891b534..a78bda68 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -21,7 +21,7 @@ dependencies: - shapely>=1.6 - geopandas>=0.7 - dask>=2.6.0 -#- bottleneck>=1.3.1,<1.4 +- bottleneck>=1.3.1,<1.4 - pyproj>=2.5 - roocs-utils>=0.2.1 - cf_xarray>=0.3.1 diff --git a/environment.yml b/environment.yml index a981b011..3ac0a43d 100644 --- a/environment.yml +++ b/environment.yml @@ -11,12 +11,12 @@ dependencies: # - netCDF4>=1.4 - poppler>=0.67 # - fiona>=1.8 - - geojson>=2.5.0 +# - geojson>=2.5.0 - shapely>=1.6 -# - geopandas>=0.7 + - geopandas>=0.7 - xesmf>=0.5.2 - dask>=2.6.0 -# - bottleneck>=1.3.1,<1.4 + - bottleneck>=1.3.1,<1.4 - pyproj>=2.5 - requests>=2.0 - roocs-utils>=0.2.1 diff --git a/requirements.txt b/requirements.txt index 1374ddf1..518fc328 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,12 +4,12 @@ pandas>=1.0.3 cftime>=1.4.1 # netCDF4>=1.4 # fiona>=1.8 -geojson>=2.5.0 +# geojson>=2.5.0 shapely>=1.6 -# geopandas>=0.7 +geopandas>=0.7 dask[complete]>=2.6 pyproj>=2.5 -# bottleneck~=1.3.1 +bottleneck~=1.3.1 requests>=2.0 roocs-utils>=0.2.1 cf-xarray>=0.3.1 From c4ecb3f547ab43e2927e687ba48893b317870a90 Mon Sep 17 00:00:00 2001 From: Eleanor Smith Date: Tue, 23 Feb 2021 09:20:30 +0000 Subject: [PATCH 3/4] add back in required dependencies --- HISTORY.rst | 2 +- docs/environment.yml | 4 +--- environment.yml | 4 +--- requirements.txt | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index a95f054d..3615b88a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,7 +6,7 @@ v0.6.1 (2021-02-22) 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, netCDF4, fiona, geopandas and bottleneck as dependencies, no longer needed. +* Remove python-dateutil, fiona and geojson as dependencies, no longer needed. v0.6.0 (2021-02-22) diff --git a/docs/environment.yml b/docs/environment.yml index a78bda68..6b32f2b9 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -13,11 +13,9 @@ dependencies: - xarray>=0.15 - pandas>=1.0.3 - cftime>=1.4.1 -#- netCDF4>=1.4 +- 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 diff --git a/environment.yml b/environment.yml index 3ac0a43d..8e6b2ea1 100644 --- a/environment.yml +++ b/environment.yml @@ -8,10 +8,8 @@ dependencies: - xarray>=0.15 - pandas>=1.0.3 - cftime>=1.4.1 -# - netCDF4>=1.4 + - netCDF4>=1.4 - poppler>=0.67 -# - fiona>=1.8 -# - geojson>=2.5.0 - shapely>=1.6 - geopandas>=0.7 - xesmf>=0.5.2 diff --git a/requirements.txt b/requirements.txt index 518fc328..b15df86c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,9 +2,7 @@ numpy>=1.16 xarray>=0.15 pandas>=1.0.3 cftime>=1.4.1 -# netCDF4>=1.4 -# fiona>=1.8 -# geojson>=2.5.0 +netCDF4>=1.4 shapely>=1.6 geopandas>=0.7 dask[complete]>=2.6 From 3861800e1da01bba989c66e4008e43dae4491f5d Mon Sep 17 00:00:00 2001 From: Eleanor Smith Date: Tue, 23 Feb 2021 09:32:08 +0000 Subject: [PATCH 4/4] update date of patch fix --- HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 3615b88a..d0f13927 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,7 +1,7 @@ Version History =============== -v0.6.1 (2021-02-22) +v0.6.1 (2021-02-23) ------------------- Bug Fixes ^^^^^^^^^