Skip to content

Add cftime git tip to upstream-dev + temporarily pin cftime #3431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcherian merged 5 commits into from
Oct 22, 2019
Merged

Add cftime git tip to upstream-dev + temporarily pin cftime #3431

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8e10dd
Add cftime git tip to upstream-dev + temporarily pin cftime
dcherian Oct 22, 2019
661c065
specify cftime min version as 1.0.0
dcherian Oct 22, 2019
d7b496f
Min cftime version 1.0.3
dcherian Oct 22, 2019
c7ebfc6
Merge remote-tracking branch 'upstream/master' into cftime-ci-temp-fix
dcherian Oct 22, 2019
fa9b644
wn
dcherian Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci/azure/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ steps:
--upgrade \
git+https://github.com/dask/dask \
git+https://github.com/dask/distributed \
git+https://github.com/zarr-developers/zarr
git+https://github.com/zarr-developers/zarr \
git+https://github.com/Unidata/cftime
condition: eq(variables['UPSTREAM_DEV'], 'true')
displayName: Install upstream dev dependencies

Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/py36-min-all-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- cartopy=0.17
- cdms2=3.1
- cfgrib=0.9
- cftime=1.0
- cftime=1.0.0
Comment thread
dcherian marked this conversation as resolved.
Outdated
- coveralls
- dask=1.2
- distributed=1.27
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/py36.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- cartopy
- cdms2
- cfgrib
- cftime
- cftime=1.0.3.4
- coveralls
- dask
- distributed
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/py37-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- cartopy
# - cdms2 # Not available on Windows
# - cfgrib>=0.9.2 # Causes Python interpreter crash on Windows
- cftime
- cftime=1.0.3.4
- coveralls
- dask
- distributed
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/py37.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- cartopy
- cdms2
- cfgrib
- cftime
- cftime=1.0.3.4
- coveralls
- dask
- distributed
Expand Down