Skip to content

Commit

Permalink
Merge branch 'alex_dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
pinarda committed Jan 11, 2022
2 parents 5a5ee6f + bea8254 commit 26c61cd
Show file tree
Hide file tree
Showing 17 changed files with 2,070 additions and 97 deletions.
1 change: 1 addition & 0 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ dependencies:
- xrft
- pandas
- pooch
- statsmodels
- pip:
- -e ..
2 changes: 2 additions & 0 deletions ci/environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ dependencies:
- scikit-image
- scipy
- setuptools
- statemodels
- xarray
- xrft
- zfpy
- cf_xarray
- astropy
- ipython
- pooch
- statsmodels
1 change: 1 addition & 0 deletions ci/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ dependencies:
- astropy
- ipython
- pooch
- statsmodels
1 change: 1 addition & 0 deletions ci/upstream-dev-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependencies:
- jupyterlab
- ipython
- pooch
- statsmodels
- pip:
- git+https://github.com/pydata/xarray.git
- git+https://github.com/xarray-contrib/cf-xarray.git
Expand Down
Loading

0 comments on commit 26c61cd

Please sign in to comment.