Skip to content

Commit

Permalink
Update contrib
Browse files Browse the repository at this point in the history
  • Loading branch information
fmaussion committed Aug 12, 2019
1 parent 489b141 commit fd898d4
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 34 deletions.
2 changes: 1 addition & 1 deletion docs/_code/prepro_invert.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Set up the input data for this example
cfg.initialize()
cfg.PATHS['working_dir'] = oggm.gettempdir('oggm_wd')
cfg.PATHS['working_dir'] = oggm.utils.get_temp_dir('oggm_wd')
cfg.PATHS['dem_file'] = get_demo_file('srtm_oetztal.tif')
cfg.set_intersects_db(get_demo_file('rgi_intersect_oetztal.shp'))

Expand Down
3 changes: 2 additions & 1 deletion docs/_code/prepro_mb.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@

# Set up the input data for this example
cfg.initialize()
cfg.PATHS['working_dir'] = oggm.gettempdir('oggm_wd')
cfg.PATHS['working_dir'] = oggm.utils.get_temp_dir('oggm_wd')
cfg.PATHS['dem_file'] = get_demo_file('srtm_oetztal.tif')
cfg.PATHS['climate_file'] = get_demo_file('histalp_merged_hef.nc')
cfg.set_intersects_db(get_demo_file('rgi_intersect_oetztal.shp'))

# Set up the run parameters
cfg.PARAMS['baseline_climate'] = 'CUSTOM'
cfg.PARAMS['run_mb_calibration'] = True
cfg.PARAMS['border'] = 80

Expand Down
28 changes: 0 additions & 28 deletions docs/environment.yml

This file was deleted.

25 changes: 25 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
numpy
scipy
pandas
shapely
matplotlib
pyproj
rasterio
Pillow
geopandas
netcdf4
scikit-image
configobj
joblib
xarray
progressbar2
pytest
motionless
dask
bottleneck
descartes
toolz
ipython
numpydoc
git+https://github.com/fmaussion/salem.git
git+https://github.com/OGGM/oggm.git
8 changes: 4 additions & 4 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
conda:
file: docs/environment.yml
python:
version: 3
setup_py_install: true
version: 3.7
install:
- requirements: docs/requirements.txt
system_packages: true

0 comments on commit fd898d4

Please sign in to comment.