[Yt-svn] yt: 9 new changesets
hg at spacepope.org
hg at spacepope.org
Mon Jan 17 12:52:22 PST 2011
hg Repository: yt
details: yt/rev/9e16d05b27f6
changeset: 3665:9e16d05b27f6
user: Matthew Turk <matthewturk at gmail.com>
date:
Sun Jan 16 00:10:16 2011 -0500
description:
Another minor modification to setup.py
hg Repository: yt
details: yt/rev/8ee8b0c17634
changeset: 3666:8ee8b0c17634
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 12:39:40 2011 -0500
description:
Updating doc information and updating Cython to 0.14 in the installation
script.
hg Repository: yt
details: yt/rev/976bf8652f3d
changeset: 3667:976bf8652f3d
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 12:40:47 2011 -0500
description:
Updating to distribute version 0.6.14
hg Repository: yt
details: yt/rev/0ab612d207a3
changeset: 3668:0ab612d207a3
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 13:00:30 2011 -0500
description:
Adding a FUNDING document. Please feel free to add to this.
hg Repository: yt
details: yt/rev/a1f9ec762bc0
changeset: 3669:a1f9ec762bc0
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 14:06:19 2011 -0500
description:
Fixing up docstring for plot collection
hg Repository: yt
details: yt/rev/2aba68d51e9b
changeset: 3670:2aba68d51e9b
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 15:42:12 2011 -0500
description:
Merging
hg Repository: yt
details: yt/rev/ca6e536c15a6
changeset: 3671:ca6e536c15a6
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 15:46:41 2011 -0500
description:
Merging from the yt-2.0 development branch into the stable branch. This
coincides with the release of yt-2.0.
hg Repository: yt
details: yt/rev/4d71aa9f969a
changeset: 3672:4d71aa9f969a
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 15:46:48 2011 -0500
description:
Added tag yt-2.0 for changeset ca6e536c15a6
hg Repository: yt
details: yt/rev/5da01bbe81ad
changeset: 3673:5da01bbe81ad
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 17 15:49:23 2011 -0500
description:
Updating version number to 2.1dev.
diffstat:
FUNDING | 35 +++++++++++++++++++
README | 3 +-
distribute_setup.py | 60 +++++++++++++++++++--------------
doc/README | 4 +-
doc/install_script.sh | 4 +-
setup.py | 7 ++-
yt/visualization/plot_collection.py | 9 ++--
yt/visualization/plot_modifications.py | 1 -
8 files changed, 83 insertions(+), 40 deletions(-)
diffs (271 lines):
diff -r 783dda4d91f2 -r 5da01bbe81ad FUNDING
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/FUNDING Mon Jan 17 15:49:23 2011 -0500
@@ -0,0 +1,35 @@
+The development of yt has benefited from funding from many different sources
+and institutions. Here is an incomplete list of these sources:
+
+ * NSF grant OCI-1048505
+ * NSF grant AST-0239709
+ * NSF grant AST-0707474
+ * NSF grant AST-0708960
+ * NSF grant AST-0808184
+ * NSF grant AST-0807215
+ * NSF grant AST-0807312
+ * NSF grant AST-0807075
+ * NSF grant AST-0908199
+ * NSF grant AST-0908553
+ * NASA grant ATFP NNX08-AH26G
+ * NASA grant ATFP NNX09-AD80G
+ * NASA grant ATFP NNZ07-AG77G
+ * DOE Computational Science Graduate Fellowship under grant number DE-FG02-97ER25308
+
+Additionally, development of yt has benefited from the hospitality and hosting
+of the following institutions:
+
+ * Columbia University
+ * Harvard-Smithsonian Center for Astrophysics
+ * Institute for Advanced Study
+ * Kavli Institute for Particle Astrophysics and Cosmology
+ * Kavli Institute for Theoretical Physics
+ * Los Alamos National Lab
+ * Michigan State University
+ * Princeton University
+ * Stanford University
+ * University of California High-Performance Astro-Computing Center
+ * University of California at Berkeley
+ * University of California at San Diego
+ * University of California at Santa Cruz
+ * University of Colorado at Boulder
diff -r 783dda4d91f2 -r 5da01bbe81ad README
--- a/README Sun Jan 16 00:02:53 2011 -0500
+++ b/README Mon Jan 17 15:49:23 2011 -0500
@@ -2,8 +2,7 @@
mesh refinement datasets. It's written in python and based on the NumPy and
Matplotlib components.
-Full documentation is available inside doc/docs_html.zip as well as
-online at http://yt.enzotools.org/ .
+Full documentation is available online at http://yt.enzotools.org/ .
If you have used Python before, and are comfortable with installing packages,
you should find the setup.py script fairly straightforward.
diff -r 783dda4d91f2 -r 5da01bbe81ad distribute_setup.py
--- a/distribute_setup.py Sun Jan 16 00:02:53 2011 -0500
+++ b/distribute_setup.py Mon Jan 17 15:49:23 2011 -0500
@@ -46,7 +46,7 @@
args = [quote(arg) for arg in args]
return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-DEFAULT_VERSION = "0.6.10"
+DEFAULT_VERSION = "0.6.14"
DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
SETUPTOOLS_FAKED_VERSION = "0.6c11"
@@ -203,6 +203,29 @@
dst.close()
return os.path.realpath(saveto)
+def _no_sandbox(function):
+ def __no_sandbox(*args, **kw):
+ try:
+ from setuptools.sandbox import DirectorySandbox
+ if not hasattr(DirectorySandbox, '_old'):
+ def violation(*args):
+ pass
+ DirectorySandbox._old = DirectorySandbox._violation
+ DirectorySandbox._violation = violation
+ patched = True
+ else:
+ patched = False
+ except ImportError:
+ patched = False
+
+ try:
+ return function(*args, **kw)
+ finally:
+ if patched:
+ DirectorySandbox._violation = DirectorySandbox._old
+ del DirectorySandbox._old
+
+ return __no_sandbox
def _patch_file(path, content):
"""Will backup the file then patch it"""
@@ -220,32 +243,11 @@
f.close()
return True
+_patch_file = _no_sandbox(_patch_file)
def _same_content(path, content):
return open(path).read() == content
-def _no_sandbox(function):
- def __no_sandbox(*args, **kw):
- try:
- from setuptools.sandbox import DirectorySandbox
- def violation(*args):
- pass
- DirectorySandbox._old = DirectorySandbox._violation
- DirectorySandbox._violation = violation
- patched = True
- except ImportError:
- patched = False
-
- try:
- return function(*args, **kw)
- finally:
- if patched:
- DirectorySandbox._violation = DirectorySandbox._old
- del DirectorySandbox._old
-
- return __no_sandbox
-
- at _no_sandbox
def _rename_path(path):
new_name = path + '.OLD.%s' % time.time()
log.warn('Renaming %s into %s', path, new_name)
@@ -285,13 +287,13 @@
'Setuptools distribution', element)
return True
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
def _after_install(dist):
log.warn('After install bootstrap.')
placeholder = dist.get_command_obj('install').install_purelib
_create_fake_setuptools_pkg_info(placeholder)
- at _no_sandbox
def _create_fake_setuptools_pkg_info(placeholder):
if not placeholder or not os.path.exists(placeholder):
log.warn('Could not find the install location')
@@ -319,6 +321,8 @@
finally:
f.close()
+_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
+
def _patch_egg_dir(path):
# let's check if it's already patched
pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
@@ -337,6 +341,7 @@
f.close()
return True
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
def _before_install():
log.warn('Before install bootstrap.')
@@ -356,8 +361,8 @@
if len(args) > index:
top_dir = args[index+1]
return location.startswith(top_dir)
- elif option == '--user' and USER_SITE is not None:
- return location.startswith(USER_SITE)
+ if arg == '--user' and USER_SITE is not None:
+ return location.startswith(USER_SITE)
return True
@@ -416,6 +421,9 @@
def _relaunch():
log.warn('Relaunching...')
# we have to relaunch the process
+ # pip marker to avoid a relaunch bug
+ if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
+ sys.argv[0] = 'setup.py'
args = [sys.executable] + sys.argv
sys.exit(subprocess.call(args))
diff -r 783dda4d91f2 -r 5da01bbe81ad doc/README
--- a/doc/README Sun Jan 16 00:02:53 2011 -0500
+++ b/doc/README Mon Jan 17 15:49:23 2011 -0500
@@ -13,9 +13,9 @@
http://yt.enzotools.org/doc/index.html
-Additionally, we include pre-generated docs right here for you, inside the zip
-file docs_html.zip. Just do this, and you get the docs, right here!
+You can also download a copy of the documentation and unzip it right here:
+wget http://yt.enzotools.org/doc/docs_html.zip
unzip docs_html.zip
Then open index.html with your favorite web browser, and be off!
diff -r 783dda4d91f2 -r 5da01bbe81ad doc/install_script.sh
--- a/doc/install_script.sh Sun Jan 16 00:02:53 2011 -0500
+++ b/doc/install_script.sh Mon Jan 17 15:49:23 2011 -0500
@@ -255,7 +255,7 @@
get_enzotools mercurial-1.7.1.tar.gz
get_enzotools ipython-0.10.tar.gz
get_enzotools h5py-1.2.0.tar.gz
-get_enzotools Cython-0.13.tar.gz
+get_enzotools Cython-0.14.tar.gz
get_enzotools Forthon-0.8.4.tar.gz
get_enzotools yt.hg
@@ -451,7 +451,7 @@
[ -n "${OLD_CFLAGS}" ] && export CFLAGS=${OLD_CFLAGS}
do_setup_py ipython-0.10
do_setup_py h5py-1.2.0
-do_setup_py Cython-0.13
+do_setup_py Cython-0.14
[ $INST_FORTHON -eq 1 ] && do_setup_py Forthon-0.8.4
echo "Doing yt update, wiping local changes and updating to branch ${BRANCH}"
diff -r 783dda4d91f2 -r 5da01bbe81ad setup.py
--- a/setup.py Sun Jan 16 00:02:53 2011 -0500
+++ b/setup.py Mon Jan 17 15:49:23 2011 -0500
@@ -8,7 +8,7 @@
import setuptools
DATA_FILES = []
-VERSION = "2.0dev"
+VERSION = "2.1dev"
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
@@ -35,8 +35,9 @@
setup(
name = "yt",
version = VERSION,
- description = "An analysis and visualization toolkit for Adaptive Mesh " \
- + "Refinement data, specifically for the Enzo and Orion codes.",
+ description = "An analysis and visualization toolkit for Astrophysical "
+ + "simulations, focusing on Adaptive Mesh Refinement data "
+ "from Enzo, Orion, FLASH, and others.",
classifiers = [ "Development Status :: 5 - Production/Stable",
"Environment :: Console",
"Intended Audience :: Science/Research",
diff -r 783dda4d91f2 -r 5da01bbe81ad yt/visualization/plot_collection.py
--- a/yt/visualization/plot_collection.py Sun Jan 16 00:02:53 2011 -0500
+++ b/yt/visualization/plot_collection.py Mon Jan 17 15:49:23 2011 -0500
@@ -195,10 +195,11 @@
Only ONE of the following options can be specified. If all 3 are
specified, they will be used in the following precedence order:
- ticks - a list of floating point numbers at which to put ticks
- minmaxtick - display DEFAULT ticks with min & max also displayed
- nticks - if ticks not specified, can automatically determine a
- number of ticks to be evenly spaced in log space
+
+ * `ticks` - a list of floating point numbers at which to put ticks
+ * `minmaxtick` - display DEFAULT ticks with min & max also displayed
+ * `nticks` - if ticks not specified, can automatically determine a
+ number of ticks to be evenly spaced in log space
"""
for plot in self.plots:
plot.set_autoscale(False)
diff -r 783dda4d91f2 -r 5da01bbe81ad yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py Sun Jan 16 00:02:53 2011 -0500
+++ b/yt/visualization/plot_modifications.py Mon Jan 17 15:49:23 2011 -0500
@@ -635,7 +635,6 @@
self.pos[y_dict[plot.data.axis]])
else: pos = self.pos
x,y = self.convert_to_pixels(plot, pos)
- print x, y
plot._axes.hold(True)
plot._axes.plot((x,),(y,),self.marker, **self.plot_args)
plot._axes.hold(False)
More information about the yt-svn
mailing list