Merge branch 'master' into release

TerrainBento · Aug 31, 2019 · 1b1b2c5 · 1b1b2c5
2 parents dd99a33 + 048821d
commit 1b1b2c5
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 14 deletions.
diff --git a/.coveralls.yaml b/.coveralls.yaml
diff --git a/.travis.yml b/.travis.yml
@@ -64,6 +64,7 @@ install:
 - pip install numpy
 - pip install -e .
 script:
-- pip install pytest pytest-cov pytest-datadir coveralls
+- pip install pytest pytest-cov coveralls
+- pip install jupyter pandas plotnine holoviews terrainbento
 - pytest --cov-report=xml:$(pwd)/coverage.xml
 after_success: coveralls
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 [![Build Status](https://travis-ci.org/TerrainBento/umami.svg?branch=master)](https://travis-ci.org/TerrainBento/umami)
 [![Build status](https://ci.appveyor.com/api/projects/status/0ehba569dttgsuyv?svg=true)](https://ci.appveyor.com/project/kbarnhart/umami)
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/TerrainBento/umami/master)
+[![Coverage Status](https://coveralls.io/repos/github/TerrainBento/umami/badge.svg?branch=master)](https://coveralls.io/github/TerrainBento/umami?branch=master)
 
 # Umami
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -17,7 +17,6 @@ platform:
   - x64
 
 os: Previous Visual Studio 2015
-# os: Visual Studio 2013
 
 init:
   - "ECHO %CONDA_INSTALL_LOCN% %CONDA_PY% %HOME% %PLATFORM%"
@@ -28,17 +27,17 @@ install:
   - cmd: conda update --yes --quiet conda
   - cmd: set PYTHONUNBUFFERED=1
   - cmd: conda config --set always_yes yes
-  - cmd: pip install twine pytest pytest-cov pytest-datadir
+  - cmd: pip install pytest
+  - cmd: pip install jupyter pandas plotnine holoviews terrainbento
   - cmd: conda info
   - cmd: conda list
 
 build: false
 
 test_script:
-  - pip install numpy"
-  - pip install -e ."
+  - pip install numpy
+  - pip install -e .
   - pytest -vvv
 
 artifacts:
-  # Archive the generated conda package in the ci.appveyor.com build report.
   - path: 'dist\*'
diff --git a/binder/postBuild b/binder/postBuild
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+pip install jupyter
+pip install holoviews
+pip install pandas
+pip install plotnine>=0.6.0
+pip install terrainbento>=1.1
+
+pip install -e .
diff --git a/environment-dev.yml b/environment-dev.yml
@@ -2,7 +2,7 @@ name: umami-dev
 channels:
   - conda-forge
 dependencies:
-   - python
+   - python>=3.6
    # for development
    - black
    - flake8

diff --git a/setup.py b/setup.py
@@ -5,6 +5,7 @@
 
 setup(
     name="umami",
+    python_requires=">=3.6",
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
     description="Umami calculates landscape metrics",
@@ -19,12 +20,6 @@
     install_requires=[
         "scipy",
         "numpy",
-        "jupyter",
-        "holoviews",
-        "pandas",
         "landlab>=1.10",
-        "terrainbento>=1.1",
-        "plotnine>=0.6.0",
     ],
-    package_data={"": ["tests/data/*"]},
 )
diff --git a/tests/test_aggregate.py → tests/test_code_aggregate.py b/tests/test_aggregate.py → tests/test_code_aggregate.py
diff --git a/tests/test_chi_intercept_gradient.py → tests/test_code_chi_intercept_gradient.py b/tests/test_chi_intercept_gradient.py → tests/test_code_chi_intercept_gradient.py
diff --git a/tests/test_discretized_misfit.py → tests/test_code_discretized_misfit.py b/tests/test_discretized_misfit.py → tests/test_code_discretized_misfit.py
diff --git a/tests/test_io.py → tests/test_code_io.py b/tests/test_io.py → tests/test_code_io.py
diff --git a/tests/test_joint_density_misfit.py → tests/test_code_joint_density_misfit.py b/tests/test_joint_density_misfit.py → tests/test_code_joint_density_misfit.py
diff --git a/tests/test_metric.py → tests/test_code_metric.py b/tests/test_metric.py → tests/test_code_metric.py
diff --git a/tests/test_residual.py → tests/test_code_residual.py b/tests/test_residual.py → tests/test_code_residual.py
diff --git a/tests/test_all_notebooks.py → tests/test_notebooks.py b/tests/test_all_notebooks.py → tests/test_notebooks.py