Merge pull request #21 from karllark/add_g16

Add Gordon et al. (2016) R(V) and f_A dependent model
karllark · Jul 29, 2017 · 0ea0f73 · 0ea0f73
2 parents 9111ac8 + 3c0cb79
commit 0ea0f73
Show file tree

Hide file tree

Showing 10 changed files with 874 additions and 703 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -97,15 +97,15 @@ matrix:
         # time.
 
         - os: linux
-          env: PYTHON_VERSION=2.7 NUMPY_VERSION=1.7
+          env: PYTHON_VERSION=2.7 NUMPY_VERSION=1.8
         - os: linux
-          env: PYTHON_VERSION=3.3 NUMPY_VERSION=1.8
+          env: PYTHON_VERSION=3.3 NUMPY_VERSION=1.9
         - os: linux
-          env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.9
+          env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.10
         - os: linux
-          env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.10
+          env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.11
         - os: linux
-          env: NUMPY_VERSION=1.11
+          env: NUMPY_VERSION=1.12
 
         # Try numpy pre-release
         - os: linux
@@ -114,13 +114,13 @@ matrix:
 
         # Do a PEP8 test with pycodestyle
         - os: linux
-          env: MAIN_CMD='pycodestyle packagename --count' SETUP_CMD=''
+          env: MAIN_CMD='pycodestyle dust_extinction --count' SETUP_CMD=''
 
     allow_failures:
         # Do a PEP8 test with pycodestyle
         # (allow to fail unless your code completely compliant)
         - os: linux
-          env: MAIN_CMD='pycodestyle packagename --count' SETUP_CMD=''
+          env: MAIN_CMD='pycodestyle dust_extinction --count' SETUP_CMD=''
 
 install:
 

diff --git a/docs/dust_extinction/index.rst b/docs/dust_extinction/index.rst
@@ -23,9 +23,9 @@ There are three differnet types of models (to be completed).
    import matplotlib.pyplot as plt
    import astropy.units as u
 
-   from dust_extinction.dust_extinction_averages import (G03_SMCBar,
-                                                         G03_LMCAvg,
-							 G03_LMC2)
+   from dust_extinction.dust_extinction import (G03_SMCBar,
+                                                G03_LMCAvg,
+					        G03_LMC2)
 
    fig, ax = plt.subplots()
 
@@ -74,8 +74,6 @@ Reference API
 .. toctree::
    :maxdepth: 1
 
-.. automodapi:: dust_extinction.dust_extinction_averages
-
 .. automodapi:: dust_extinction.dust_extinction
 
 Indices and tables