fixed setup.py to put spa_py in the right place

fixed setup.py to put spa_py in the right place

Author: alorenzo175

.gitignore

@@ -2,6 +2,9 @@
 __pycache__/
 *.py[cod]
 
+# emacs temp files
+*~
+
 # C extensions
 *.so
 
@@ -16,10 +19,7 @@ parts/
 sdist/
 var/
 Drafts/
-<<<<<<< HEAD
 */build/
-=======
->>>>>>> 159b2e2a6b776f4d0fbc209b221d7fcfd914cc3c
 build/
 
 *.egg-info/

README.md

@@ -56,7 +56,7 @@ Hopefully you're using [virtualenv](http://virtualenv.readthedocs.org/en/latest/
 pip install .
 ```
 
-Add ``-e`` to install in [develop mode](http://pip.readthedocs.org/en/latest/reference/pip_install.html#editable-installs). Note, this mode may not properly link ``spa_py`` so a warning is issued by ``pvlib.solarposition`` when trying to import it.
+Add ``-e`` to install in [develop mode](http://pip.readthedocs.org/en/latest/reference/pip_install.html#editable-installs).
 
 ```
 # built-in imports

setup.py

@@ -56,7 +56,7 @@
 
 extensions = []
 
-spa_ext = Extension('pvlib/spa_c_files/spa_py', 
+spa_ext = Extension('pvlib.spa_c_files.spa_py', 
                     sources = ['pvlib/spa_c_files/spa.c', 
                               'pvlib/spa_c_files/spa_py.c'],
                     depends = ['pvlib/spa_c_files/spa.h'])