Python builds are now based on distutils, interfaces/python/test.py b…

…roken!
igraph · Nov 3, 2006 · 41084a3 · 41084a3
1 parent 3010f66
commit 41084a3
Show file tree

Hide file tree

Showing 23 changed files with 370 additions and 30 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,4 @@
+include src/*.h
+include igraph/*.h
+MANIFEST.in
+LICENSE
diff --git a/Makefile.am b/Makefile.am
diff --git a/package/__init__.py b/package/__init__.py
@@ -0,0 +1,20 @@
+#   IGraph library.
+#   Copyright (C) 2006  Gabor Csardi <csardi@rmki.kfki.hu>
+#   MTA RMKI, Konkoly-Thege Miklos st. 29-33, Budapest 1121, Hungary
+#   
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#   
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#   
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc.,  51 Franklin Street, Fifth Floor, Boston, MA 
+#   02110-1301 USA
+from igraph._igraph import *
+from igraph._igraph import __version__, __build_date__
diff --git a/bfsiter.c → src/bfsiter.c b/bfsiter.c → src/bfsiter.c
diff --git a/bfsiter.h → src/bfsiter.h b/bfsiter.h → src/bfsiter.h
diff --git a/common.c → src/common.c b/common.c → src/common.c
diff --git a/common.h → src/common.h b/common.h → src/common.h
diff --git a/convert.c → src/convert.c b/convert.c → src/convert.c
diff --git a/convert.h → src/convert.h b/convert.h → src/convert.h
diff --git a/edgeobject.c → src/edgeobject.c b/edgeobject.c → src/edgeobject.c
diff --git a/edgeobject.h → src/edgeobject.h b/edgeobject.h → src/edgeobject.h
diff --git a/edgeseqobject.c → src/edgeseqobject.c b/edgeseqobject.c → src/edgeseqobject.c
diff --git a/edgeseqobject.h → src/edgeseqobject.h b/edgeseqobject.h → src/edgeseqobject.h
diff --git a/error.c → src/error.c b/error.c → src/error.c
diff --git a/error.h → src/error.h b/error.h → src/error.h
diff --git a/graphobject.c → src/graphobject.c b/graphobject.c → src/graphobject.c
diff --git a/graphobject.h → src/graphobject.h b/graphobject.h → src/graphobject.h
diff --git a/igraphmodule.c → src/igraphmodule.c b/igraphmodule.c → src/igraphmodule.c
@@ -35,6 +35,7 @@
 #include "edgeseqobject.h"
 #include "edgeobject.h"
 #include "bfsiter.h"
+#include "config.h"
 
 /**
  * \defgroup python_interface Python module implementation
@@ -1028,9 +1029,7 @@ static PyMethodDef igraphmodule_methods[] =
 
 extern PyObject* igraphmodule_InternalError;
 
-PyMODINIT_FUNC
-initigraph(void)
-{
+PyMODINIT_FUNC init_igraph(void) {
   PyObject* m;  ///< igraph module object
 
   igraphmodule_VertexSeqType.tp_traverse = (traverseproc)igraphmodule_VertexSeq_traverse;
@@ -1060,7 +1059,7 @@ initigraph(void)
 
   Py_INCREF(igraphmodule_InternalError);
 
-  m = Py_InitModule3("igraph", igraphmodule_methods,
+  m = Py_InitModule3("igraph._igraph", igraphmodule_methods,
 		     "Python interface for the igraph library");
 
   Py_INCREF(&igraphmodule_GraphType);
@@ -1098,7 +1097,10 @@ initigraph(void)
   PyModule_AddIntConstant(m, "ADJ_PLUS", IGRAPH_ADJ_PLUS);
   PyModule_AddIntConstant(m, "ADJ_UPPER", IGRAPH_ADJ_UPPER);
   PyModule_AddIntConstant(m, "ADJ_LOWER", IGRAPH_ADJ_LOWER);
-
+
+  PyModule_AddStringConstant(m, "__version__", VERSION);
+  PyModule_AddStringConstant(m, "__build_date__", __DATE__);
+
   /* initialize error, progress and interruption handler */
   igraph_set_error_handler(igraphmodule_igraph_error_hook);
   igraph_set_progress_handler(igraphmodule_igraph_progress_hook);

diff --git a/vertexobject.c → src/vertexobject.c b/vertexobject.c → src/vertexobject.c
diff --git a/vertexobject.h → src/vertexobject.h b/vertexobject.h → src/vertexobject.h
diff --git a/vertexseqobject.c → src/vertexseqobject.c b/vertexseqobject.c → src/vertexseqobject.c
diff --git a/vertexseqobject.h → src/vertexseqobject.h b/vertexseqobject.h → src/vertexseqobject.h