Merge pull request #30 from larrybradley/install

Add dust_attenuation and dust_extinction to setup as required dependencies

README.rst

@@ -27,10 +27,6 @@ Installation instructions
 
     pip install eazy
 
-    # Forked dependencies that don't come with pip
-    pip install git+https://github.com/gbrammer/dust_attenuation.git
-    pip install git+https://github.com/gbrammer/dust_extinction.git
-
 Demo
 ~~~~
 
@@ -42,5 +38,5 @@ Demo
 
 
 Citation
-~~~~~~~~~~~~~
-Please cite both this reposiotry and `Brammer et al. (2008) <https://ui.adsabs.harvard.edu/abs/2008ApJ...686.1503B/abstract>`_. A BiBTeX for this repository can be generated via the *Cite this repository* link in the upper left corner of the `GitHub page <https://github.com/gbrammer/eazy-py>`_.
+~~~~~~~~
+Please cite both this repository and `Brammer et al. (2008) <https://ui.adsabs.harvard.edu/abs/2008ApJ...686.1503B/abstract>`_. A BiBTeX for this repository can be generated via the *Cite this repository* link in the upper left corner of the `GitHub page <https://github.com/gbrammer/eazy-py>`_.

docs/eazy/install.rst

@@ -6,10 +6,6 @@ Install with `pip`
 .. code:: bash
 
     pip install eazy
-    
-    # Forked dependencies that don't come with pip
-    pip install git+https://github.com/gbrammer/dust_attenuation.git
-    pip install git+https://github.com/gbrammer/dust_extinction.git
 
 Install from the repository
 ===========================
@@ -37,4 +33,4 @@ Install from the repository
 Binder Demo
 ~~~~~~~~~~~
 .. image:: https://mybinder.org/badge_logo.svg
- :target: https://mybinder.org/v2/gh/gbrammer/eazy-py/HEAD?filepath=docs%2Fexamples%2FHDFN-demo.ipynb
+ :target: https://mybinder.org/v2/gh/gbrammer/eazy-py/HEAD?filepath=docs%2Fexamples%2FHDFN-demo.ipynb

requirements.txt

@@ -7,14 +7,13 @@
 # tqdm
 # h5py
 
-# dustmaps needs healpy in environment.yml since 
+# dustmaps needs healpy in environment.yml since
 # often can't compile on Mac with pip
 # ... removing requirement so that can distribute just with requirements.txt
 # dustmaps
 
-# My clones of the dust modules
-git+https://github.com/gbrammer/dust_extinction.git
-git+https://github.com/gbrammer/dust_attenuation.git
+# git+https://github.com/gbrammer/dust_extinction.git
+# git+https://github.com/gbrammer/dust_attenuation.git
 
 # Needed for template smoothing, doesn't bring whole fsps distro
 astro-sedpy>=0.3

setup.cfg

@@ -28,6 +28,8 @@ install_requires =
     tqdm
     h5py
     astro-sedpy>=0.3
+    dust_attenuation @ git+https://github.com/karllark/dust_attenuation#egg=dust_attenuation
+    dust_extinction @ git+https://github.com/gbrammer/dust_extinction.git#egg=dust_extinction
 packages = find:
 include_package_data = True
 
@@ -38,16 +40,14 @@ test =
 docs =
     sphinx
     sphinx-astropy
-    dust_attenuation @ git+https://github.com/gbrammer/dust_attenuation.git
-    dust_extinction @ git+https://github.com/gbrammer/dust_extinction.git
 
 [options.package_data]
-eazy.data = 
+eazy.data =
     *.txt
     alpha_lyr_stis_008.fits
     emlines_info.dat
     zphot.param.default
-    
+
 [build_sphinx]
 source-dir = docs
 build-dir = docs/_build
@@ -67,6 +67,6 @@ minversion = 5.0
 norecursedirs = eazy-photoz build docs/build
 testpaths =
     eazy/tests
-    
+
 [flake8]
-exclude = *parsetab.py,conftest.py,docs/conf.py,scripts/*
+exclude = *parsetab.py,conftest.py,docs/conf.py,scripts/*