[cig-commits] [commit] v1.9-stable: Remove python eggs. (f0c6fe3)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : v1.9-stable
Link       : https://github.com/geodynamics/pylith/compare/85f521a25f77568bf84af1c32cc9f58a117634b2...f0c6fe37d628908afd6f03f4e7d56f98105e1797

>---------------------------------------------------------------

commit f0c6fe37d628908afd6f03f4e7d56f98105e1797
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Thu Sep 26 12:06:11 2013 -0700

    Remove python eggs.


>---------------------------------------------------------------

f0c6fe37d628908afd6f03f4e7d56f98105e1797
 Makefile.am        | 10 +---------
 configure.ac       | 11 ++++++++---
 pylith/__init__.py |  2 ++
 setup.py           | 41 -----------------------------------------
 4 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e15736b..68b5d6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,15 +46,7 @@ endif
 
 EXTRA_DIST = \
 	CHANGES \
-	DEPENDENCIES \
-	setup.py \
-	archimedes/__init__.py
-
-install-data-hook:
-	top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
-		cd $(top_srcdir) && \
-		$(PYTHON) setup.py install_deps -H None -f $$top_builddir/deps --prefix=$(prefix) && \
-		$(PYTHON) setup.py egg_info -e $(pythondir)
+	DEPENDENCIES
 
 
 # End of file 
diff --git a/configure.ac b/configure.ac
index c5b6e6c..a96bac7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,9 +155,6 @@ CIT_HEADER_PETSC
 CIT_CHECK_LIB_PETSC
 CIT_CHECK_LIB_PETSC_SIEVE
 
-# Check for Python modules and packages.
-CIT_PYTHON_EGG_SETUP
-
 # Large file support
 AC_SYS_LARGEFILE
 
@@ -238,9 +235,17 @@ fi
 CIT_PROJ4_HEADER
 CIT_PROJ4_LIB
 
+# PYTHIA
+CIT_PYTHON_MODULE([pyre],[0.8.1])
+CIT_PYTHON_MODULE([journal],[0.8.1])
+eval p=`$PYTHON -c "import pyre; print pyre.__""file__.replace('pyre/__init__.pyc','')"`
+PYTHON_EGG_CPPFLAGS="-I$p"
+AC_SUBST(PYTHON_EGG_CPPFLAGS)
+
 # SPATIALDATA
 CIT_SPATIALDATA_HEADER
 CIT_SPATIALDATA_LIB
+CIT_PYTHON_MODULE([spatialdata],[1.9.3])
 
 # DOXYGEN
 if test "$enable_documentation" = "yes" ; then
diff --git a/pylith/__init__.py b/pylith/__init__.py
index 4eb04c1..23fdc48 100644
--- a/pylith/__init__.py
+++ b/pylith/__init__.py
@@ -20,6 +20,8 @@
 
 ## @brief Python top-level PyLith module initialization
 
+__version__ = "1.9.0"
+
 __all__ = ['apps',
            'bc',
            'faults',
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 71ed611..0000000
--- a/setup.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard, U.S. Geological Survey
-# Charles A. Williams, GNS Science
-# Matthew G. Knepley, University of Chicago
-#
-# This code was developed as part of the Computational Infrastructure
-# for Geodynamics (http://geodynamics.org).
-#
-# Copyright (c) 2010-2013 University of California, Davis
-#
-# See COPYING for license information.
-#
-# ----------------------------------------------------------------------
-#
-
-from archimedes import use_merlin
-use_merlin()
-
-from merlin import setup, find_packages
-
-setup(
-    
-    name = 'PyLith', 
-    version = '1.9.0',
-
-    zip_safe = False,
-    packages = find_packages(),
-    
-    install_requires = [
-    'spatialdata',
-    'pythia[mpi] >= 0.8.1.6, < 0.8.2a',
-    ],
-
-    author = 'Brad Aagaard, Charles A. Williams, and Matt Knepley',
-    author_email = 'cig-short at geodynamics.org',
-    description = """A finite element code for the solution of crustal deformation problems associated with earthquakes, including kinematic ruptures, spontaneous ruptures, and pre- and post-seismic deformation.""",
-    license = 'other',
-    url = 'http://www.geodynamics.org/cig/software/packages/short/pylith/',
-
-)