Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
kbarnhart committed Aug 31, 2019
2 parents 880106b + 89daf5e commit dd99a33
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion environment-dev.yml
Expand Up @@ -17,5 +17,5 @@ dependencies:
- jupyter
- holoviews
- pandas
- plotnine
- plotnine>=0.6.0
- terrainbento>=1.1
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -24,7 +24,7 @@
"pandas",
"landlab>=1.10",
"terrainbento>=1.1",
"plotnine",
"plotnine>=0.6.0",
],
package_data={"": ["tests/data/*"]},
)

0 comments on commit dd99a33

Please sign in to comment.