Revert pip installation changes; pip install doesn't work reliably.

badlands-model · Apr 27, 2016 · 51d2f26 · 51d2f26
1 parent 3c42edc
commit 51d2f26
Showing 1 changed file with 33 additions and 15 deletions.
diff --git a/setup.py b/setup.py
@@ -2,36 +2,52 @@
 
 """
 setup.py for pyBadlands
-
 """
 from numpy.distutils.core import setup, Extension
 
+ext_modules = []
+'''
+# NOTE: compilation of f90 source is not working yet. You must run `make` from the libUtils directory.
+# You can install the package using 'pip install -e <checkout dir>', but a packaged installation is not likely to work.
+PDstack_mod = Extension(name = "PDstack",
+                         sources=['libUtils/PDstack.f90'],
+                      #extra_f90_compile_args=["-ffixed-form"],
+                      )
 ext_modules = [
     Extension(
         name="SFDalgo",
-        sources=['pyBadlands/libUtils/SFDalgo.f90'],
+        sources=['libUtils/SFDalgo.f90'],
+        #extra_f90_compile_args=["-ffixed-form"],
     ),
     Extension(
         name="FLOWalgo",
-        sources=['pyBadlands/libUtils/FLOWalgo.f90'],
+        sources=['libUtils/FLOWalgo.f90'],
+        #extra_f90_compile_args=["-ffixed-form"],
     ),
     Extension(
         name="FLWnetwork",
-        sources=['pyBadlands/libUtils/FLOWstack.f90', 'pyBadlands/libUtils/FLWnetwork.f90'],
+        sources=['libUtils/FLOWstack.f90', 'libUtils/FLWnetwork.f90'],
+        #extra_f90_compile_args=["-ffixed-form"],
     ),
     Extension(
         name="PDalgo",
-        sources=['pyBadlands/libUtils/PDalgo.f90'],
-    ),
-    Extension(
-        name="FVframe",
-        sources=['pyBadlands/libUtils/FVclass.f90', 'pyBadlands/libUtils/FVframe.f90'],
+        # sources=['libUtils/PDstack.f90', 'libUtils/PDalgo.f90'],
+        sources=['libUtils/PDalgo.f90'],
+        #extra_f90_compile_args=["-ffixed-form"],
     ),
-    Extension(
-        name="FASTloop",
-        sources=['pyBadlands/libUtils/FASTloop.f90'],
-    )
+    #Extension(
+        #name="FVclass",
+        #sources=['libUtils/FVclass.f90'],
+        ##extra_f90_compile_args=["-ffixed-form"],
+    #),
+    #Extension(
+        #name="FVframe",
+        ##sources=['libUtils/FVframe.f90'],#, 'libUtils/FVclass.f90'],
+        #sources=['libUtils/FVclass.f90', 'libUtils/FVframe.f90'],
+        ##extra_f90_compile_args=["-ffixed-form"],
+    #),
 ]
+'''
 
 setup(
     name="pyBadlands",
@@ -43,8 +59,10 @@
     classifiers=[
         "Development Status :: 3 - Alpha",
     ],
-    packages=['pyBadlands', 'pyBadlands.flow', 'pyBadlands.forcing', 'pyBadlands.hillslope', 'pyBadlands.libUtils', 'pyBadlands.surface'],
-    ext_package='pyBadlands.libUtils',
+    packages=['pyBadlands', 'pyBadlands.libUtils'],#, 'pyBadlands.raster2TIN', 'pyBadlands.FVmethod'],
+    # py_modules = modules,
+    ext_package='pyBadlands',
     ext_modules=ext_modules,
     scripts=[],
 )
+