[Yt-svn] yt: 8 new changesets
hg at spacepope.org
hg at spacepope.org
Wed Mar 24 00:24:51 PDT 2010
hg Repository: yt
details: yt/rev/f87a0f7ce5c7
changeset: 1468:f87a0f7ce5c7
user: mturk
date:
Wed Mar 17 12:49:21 2010 -0700
description:
[svn r1666] Forgot to add the exceptions module
hg Repository: yt
details: yt/rev/21713b636f74
changeset: 1469:21713b636f74
user: mturk
date:
Wed Mar 17 12:52:00 2010 -0700
description:
[svn r1667] Also forot Sam's image handling module...
hg Repository: yt
details: yt/rev/13bc99bd2658
changeset: 1470:13bc99bd2658
user: mturk
date:
Wed Mar 17 14:25:03 2010 -0700
description:
[svn r1668] Some minor fixes to the time series analysis and adding data_objects as a
subpackage
hg Repository: yt
details: yt/rev/836ff2d6b1ff
changeset: 1471:836ff2d6b1ff
user: mturk
date:
Wed Mar 17 17:15:20 2010 -0700
description:
[svn r1669] Fixing the 10.5 install script
hg Repository: yt
details: yt/rev/034288520320
changeset: 1472:034288520320
user: mturk
date:
Wed Mar 17 17:16:13 2010 -0700
description:
[svn r1670] Another minor fix, for distribute vs setuptools
hg Repository: yt
details: yt/rev/394b215ab1ff
changeset: 1473:394b215ab1ff
user: sskory
date:
Sat Mar 20 16:58:10 2010 -0700
description:
[svn r1671] Small typo in HaloFinding for parallelHF & rms_vel.
hg Repository: yt
details: yt/rev/e82d5912b954
changeset: 1474:e82d5912b954
user: mturk
date:
Tue Mar 23 22:19:10 2010 -0700
description:
[svn r1673] This is kind of a hack, but it fixes pickling of 2D data objects -- useful for
pushing and pulling objects across the network in IPython. Most of the 2D data
objects assume that self.field is a string, but here the field variable was
bound to the local namespace "field", which was uninitialized in the local
namespace. So, it was usually set to something like PreShock_Density, when it
should be set to the variable fields. But to match up, we ensure it's a list
and take the first element.
hg Repository: yt
details: yt/rev/1561615dd7c9
changeset: 1475:1561615dd7c9
user: Matthew Turk <matthewturk at gmail.com>
date:
Wed Mar 24 00:24:43 2010 -0700
description:
Merging back from trunk
diffstat:
doc/install_script.sh | 2 +-
doc/install_script_osx.sh | 15 +-
scripts/fbranch | 5 +-
scripts/fbury | 5 +-
scripts/fdigup | 5 +-
scripts/fido | 5 +-
scripts/fimport | 5 +-
yt/amr_utils.c | 16482 ++++++++++++-------------
yt/arraytypes.py | 11 +
yt/data_objects/analyzer_objects.py | 2 +-
yt/data_objects/time_series.py | 2 +-
yt/exceptions.py | 43 +
yt/extensions/EnzoSimulation.py | 21 +-
yt/extensions/MergerTree.py | 666 +
yt/extensions/StarAnalysis.py | 15 +-
yt/extensions/image_panner/__init__.py | 25 +
yt/extensions/image_panner/pan_and_scan_widget.py | 90 +
yt/extensions/image_panner/vm_panner.py | 280 +
yt/extensions/volume_rendering/image_handling.py | 165 +
yt/fido/share_data.py | 83 +
yt/lagos/BaseDataTypes.py | 3 +-
yt/lagos/HaloFinding.py | 6 +-
yt/lagos/StructureFunctionGenerator.py | 696 +
yt/lagos/__init__.py | 2 +
yt/lagos/kd.py | 2 +-
yt/lagos/parallelHOP/parallelHOP.py | 5 +-
yt/mods.py | 3 +-
yt/raven/PlotTypes.py | 11 +-
yt/raven/_MPL.c | 43 +-
yt/reason/plot_editors.py | 10 +-
yt/reason/reason_v2.py | 5 +-
yt/reason/tvtk_interface.py | 5 +-
yt/setup.py | 1 +
33 files changed, 9842 insertions(+), 8877 deletions(-)
diffs (truncated from 30219 to 300 lines):
diff -r e2bee51cac3b -r 1561615dd7c9 doc/install_script.sh
--- a/doc/install_script.sh Wed Mar 17 11:34:38 2010 -0700
+++ b/doc/install_script.sh Wed Mar 24 00:24:43 2010 -0700
@@ -32,7 +32,7 @@
INST_ZLIB=1 # On some systems (Kraken) matplotlib has issues with
# the system zlib, which is compiled statically.
# If need be, you can turn this off.
-INST_TRAITS=0 # Experimental TraitsUI installation
+INST_TRAITS=1 # Experimental TraitsUI installation
INST_HG=1 # Install Mercurial or not?
# If you've got YT some other place, set this to point to it.
diff -r e2bee51cac3b -r 1561615dd7c9 doc/install_script_osx.sh
--- a/doc/install_script_osx.sh Wed Mar 17 11:34:38 2010 -0700
+++ b/doc/install_script_osx.sh Wed Mar 24 00:24:43 2010 -0700
@@ -50,6 +50,11 @@
echo
[ ! -e $1 ] && tar xfz $1.tar.gz
cd $1
+ if [ ! -z `echo $1 | grep h5py` ]
+ then
+ echo "${PY_DIR}/bin/python2.5 setup.py configure --hdf5=${HDF5_DIR}"
+ ( ${PY_DIR}/bin/python2.5 setup.py configure --hdf5=${HDF5_DIR} 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ fi
shift
( sudo ${PY_DIR}/bin/python2.5 setup.py install $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
touch done
@@ -127,8 +132,8 @@
get_enzotools wxPython2.8-osx-unicode-2.8.9.2-universal-py2.5.dmg
get_enzotools numpy-1.2.1-py2.5-macosx10.5.dmg
get_enzotools matplotlib-0.98.5.2-py2.5-mpkg.zip
-get_enzotools ipython-0.9.1.tar.gz
-get_enzotools h5py-1.1.0.tar.gz
+get_enzotools ipython-0.10.tar.gz
+get_enzotools h5py-1.2.0.tar.gz
if [ -z "$YT_DIR" ]
then
@@ -175,7 +180,7 @@
echo "Installing setuptools (needs sudo)"
echo
-( sudo ${PY_DIR}/bin/python2.5 ${YT_DIR}/ez_setup.py 2>&1 ) 1>> ${LOG_FILE} || do_exit
+( sudo ${PY_DIR}/bin/python2.5 ${YT_DIR}/distribute_setup.py 2>&1 ) 1>> ${LOG_FILE} || do_exit
[ ! -e ${DEST_DIR}/src/np_done ] && self_install \
numpy-1.2.1-py2.5-macosx10.5.dmg
@@ -188,8 +193,8 @@
touch ${DEST_DIR}/src/mp_done
fi
-do_setup_py ipython-0.9.1
-do_setup_py h5py-1.1.0
+do_setup_py ipython-0.10
+do_setup_py h5py-1.2.0
echo "Doing yt update"
MY_PWD=`pwd`
diff -r e2bee51cac3b -r 1561615dd7c9 scripts/fbranch
--- a/scripts/fbranch Wed Mar 17 11:34:38 2010 -0700
+++ b/scripts/fbranch Wed Mar 24 00:24:43 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r e2bee51cac3b -r 1561615dd7c9 scripts/fbury
--- a/scripts/fbury Wed Mar 17 11:34:38 2010 -0700
+++ b/scripts/fbury Wed Mar 24 00:24:43 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r e2bee51cac3b -r 1561615dd7c9 scripts/fdigup
--- a/scripts/fdigup Wed Mar 17 11:34:38 2010 -0700
+++ b/scripts/fdigup Wed Mar 24 00:24:43 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r e2bee51cac3b -r 1561615dd7c9 scripts/fido
--- a/scripts/fido Wed Mar 17 11:34:38 2010 -0700
+++ b/scripts/fido Wed Mar 24 00:24:43 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r e2bee51cac3b -r 1561615dd7c9 scripts/fimport
--- a/scripts/fimport Wed Mar 17 11:34:38 2010 -0700
+++ b/scripts/fimport Wed Mar 24 00:24:43 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r e2bee51cac3b -r 1561615dd7c9 yt/amr_utils.c
--- a/yt/amr_utils.c Wed Mar 17 11:34:38 2010 -0700
+++ b/yt/amr_utils.c Wed Mar 24 00:24:43 2010 -0700
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.12.1 on Wed Mar 17 11:33:49 2010 */
+/* Generated by Cython 0.11.3 on Thu Mar 11 12:24:36 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -6,7 +6,6 @@
#ifndef Py_PYTHON_H
#error Python headers needed to compile C extensions, please install development version of Python.
#else
-
#ifndef PY_LONG_LONG
#define PY_LONG_LONG LONG_LONG
#endif
@@ -16,9 +15,7 @@
#if PY_VERSION_HEX < 0x02040000
#define METH_COEXIST 0
#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
- #define PyDict_Contains(d,o) PySequence_Contains(d,o)
-#endif
-
+#endif
#if PY_VERSION_HEX < 0x02050000
typedef int Py_ssize_t;
#define PY_SSIZE_T_MAX INT_MAX
@@ -28,9 +25,7 @@
#define PyInt_AsSsize_t(o) PyInt_AsLong(o)
#define PyNumber_Index(o) PyNumber_Int(o)
#define PyIndex_Check(o) PyNumber_Check(o)
- #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
-#endif
-
+#endif
#if PY_VERSION_HEX < 0x02060000
#define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
@@ -40,17 +35,17 @@
#define PyType_Modified(t)
typedef struct {
- void *buf;
- PyObject *obj;
- Py_ssize_t len;
- Py_ssize_t itemsize;
- int readonly;
- int ndim;
- char *format;
- Py_ssize_t *shape;
- Py_ssize_t *strides;
- Py_ssize_t *suboffsets;
- void *internal;
+ void *buf;
+ PyObject *obj;
+ Py_ssize_t len;
+ Py_ssize_t itemsize;
+ int readonly;
+ int ndim;
+ char *format;
+ Py_ssize_t *shape;
+ Py_ssize_t *strides;
+ Py_ssize_t *suboffsets;
+ void *internal;
} Py_buffer;
#define PyBUF_SIMPLE 0
@@ -64,32 +59,22 @@
#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
#endif
-
#if PY_MAJOR_VERSION < 3
#define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
#else
#define __Pyx_BUILTIN_MODULE_NAME "builtins"
#endif
-
#if PY_MAJOR_VERSION >= 3
#define Py_TPFLAGS_CHECKTYPES 0
#define Py_TPFLAGS_HAVE_INDEX 0
#endif
-
#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
#define Py_TPFLAGS_HAVE_NEWBUFFER 0
#endif
-
#if PY_MAJOR_VERSION >= 3
#define PyBaseString_Type PyUnicode_Type
- #define PyString_Type PyUnicode_Type
- #define PyString_CheckExact PyUnicode_CheckExact
-#else
- #define PyBytes_Type PyString_Type
- #define PyBytes_CheckExact PyString_CheckExact
-#endif
-
-#if PY_MAJOR_VERSION >= 3
+ #define PyString_Type PyBytes_Type
+ #define PyString_CheckExact PyBytes_CheckExact
#define PyInt_Type PyLong_Type
#define PyInt_Check(op) PyLong_Check(op)
#define PyInt_CheckExact(op) PyLong_CheckExact(op)
@@ -104,17 +89,13 @@
#define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
#define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)
- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)
#else
#define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)
- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)
-
-#endif
-
+ #define PyBytes_Type PyString_Type
+#endif
#if PY_MAJOR_VERSION >= 3
#define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)
#endif
-
#if !defined(WIN32) && !defined(MS_WINDOWS)
#ifndef __stdcall
#define __stdcall
@@ -128,7 +109,6 @@
#else
#define _USE_MATH_DEFINES
#endif
-
#if PY_VERSION_HEX < 0x02050000
#define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))
#define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
@@ -138,7 +118,6 @@
#define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
#define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),(n))
#endif
-
#if PY_VERSION_HEX < 0x02050000
#define __Pyx_NAMESTR(n) ((char *)(n))
#define __Pyx_DOCSTR(n) ((char *)(n))
@@ -156,21 +135,24 @@
#include "stdlib.h"
#include "stdio.h"
#include "numpy/arrayobject.h"
-#include "numpy/ufuncobject.h"
#include "math.h"
#include "FixedInterpolator.h"
-
-#ifndef CYTHON_INLINE
- #if defined(__GNUC__)
- #define CYTHON_INLINE __inline__
- #elif defined(_MSC_VER)
- #define CYTHON_INLINE __inline
- #else
- #define CYTHON_INLINE
- #endif
-#endif
-
-typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/
+#define __PYX_USE_C99_COMPLEX defined(_Complex_I)
+
+
+#ifdef __GNUC__
+#define INLINE __inline__
+#elif _WIN32
+#define INLINE __inline
+#else
+#define INLINE
+#endif
+
+typedef struct {PyObject **p; char *s; long n; char is_unicode; char intern; char is_identifier;} __Pyx_StringTabEntry; /*proto*/
+
+
+
+static int __pyx_skip_dispatch = 0;
/* Type Conversion Predeclarations */
@@ -189,8 +171,8 @@
#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) __Pyx_PyBytes_AsString(s))
#define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
-static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
+static INLINE int __Pyx_PyObject_IsTrue(PyObject*);
+static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
#if !defined(T_PYSSIZET)
#if PY_VERSION_HEX < 0x02050000
@@ -254,9 +236,9 @@
#endif
#endif
More information about the yt-svn
mailing list