[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Apr 1 07:57:42 PDT 2014
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/81c3eeed52f2/
Changeset: 81c3eeed52f2
Branch: yt-3.0
User: jzuhone
Date: 2014-03-29 20:32:41
Summary: Windows can't compile without this line
Affected #: 1 file
diff -r 1bfcd605e059963bf03f422bb2aa18f1cca77305 -r 81c3eeed52f279a73ec244e7f676c2de6c095215 yt/utilities/lib/setup.py
--- a/yt/utilities/lib/setup.py
+++ b/yt/utilities/lib/setup.py
@@ -100,6 +100,7 @@
config.add_extension("origami",
["yt/utilities/lib/origami.pyx",
"yt/utilities/lib/origami_tags.c"],
+ include_dirs=["yt/utilities/lib/"],
depends=["yt/utilities/lib/origami_tags.h"])
config.add_extension("image_utilities",
["yt/utilities/lib/image_utilities.pyx"],
https://bitbucket.org/yt_analysis/yt/commits/6298e1994073/
Changeset: 6298e1994073
Branch: yt-3.0
User: jzuhone
Date: 2014-03-29 22:58:01
Summary: yt on Windows barfs without these small changes.
Affected #: 2 files
diff -r 81c3eeed52f279a73ec244e7f676c2de6c095215 -r 6298e1994073d86eea088d3cf6a36e7ec2696845 yt/frontends/halo_catalogs/api.py
--- a/yt/frontends/halo_catalogs/api.py
+++ b/yt/frontends/halo_catalogs/api.py
@@ -14,12 +14,12 @@
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
-from halo_catalog.api import \
+from .halo_catalog.api import \
HaloCatalogDataset, \
IOHandlerHaloCatalogHDF5, \
HaloCatalogFieldInfo
-from rockstar.api import \
+from .rockstar.api import \
RockstarDataset, \
IOHandlerRockstarBinary, \
RockstarFieldInfo
diff -r 81c3eeed52f279a73ec244e7f676c2de6c095215 -r 6298e1994073d86eea088d3cf6a36e7ec2696845 yt/frontends/sph/data_structures.py
--- a/yt/frontends/sph/data_structures.py
+++ b/yt/frontends/sph/data_structures.py
@@ -520,7 +520,10 @@
f = open(filename,'rb')
except:
return False, 1
- fs = len(f.read())
+ try:
+ fs = len(f.read())
+ except IOError:
+ return False, 1
f.seek(0)
#Read in the header
t, n, ndim, ng, nd, ns = struct.unpack("<diiiii", f.read(28))
https://bitbucket.org/yt_analysis/yt/commits/e56cfc47e2c9/
Changeset: e56cfc47e2c9
Branch: yt-3.0
User: jzuhone
Date: 2014-03-29 23:12:43
Summary: only_on_root isn't here anymore
Affected #: 2 files
diff -r 6298e1994073d86eea088d3cf6a36e7ec2696845 -r e56cfc47e2c9028a3cef3833ff7acbf68a96ac9c yt/analysis_modules/cosmological_observation/light_cone/light_cone.py
--- a/yt/analysis_modules/cosmological_observation/light_cone/light_cone.py
+++ b/yt/analysis_modules/cosmological_observation/light_cone/light_cone.py
@@ -26,7 +26,6 @@
from yt.utilities.cosmology import \
Cosmology
from yt.utilities.parallel_tools.parallel_analysis_interface import \
- only_on_root, \
parallel_objects, \
parallel_root_only
from yt.visualization.image_writer import \
diff -r 6298e1994073d86eea088d3cf6a36e7ec2696845 -r e56cfc47e2c9028a3cef3833ff7acbf68a96ac9c yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -25,7 +25,6 @@
HaloProfiler
from yt.convenience import load
from yt.utilities.parallel_tools.parallel_analysis_interface import \
- only_on_root, \
parallel_objects, \
parallel_root_only
from yt.utilities.physical_constants import \
https://bitbucket.org/yt_analysis/yt/commits/6b95f2a269c3/
Changeset: 6b95f2a269c3
Branch: yt-3.0
User: MatthewTurk
Date: 2014-04-01 16:57:34
Summary: Merged in jzuhone/yt-3.x/yt-3.0 (pull request #781)
Small fixes for Windows
Affected #: 5 files
diff -r b186d0f32552017f585f691ba9d8413bc01a967d -r 6b95f2a269c34bcbdff3ca212b67ddce1401d9e9 yt/analysis_modules/cosmological_observation/light_cone/light_cone.py
--- a/yt/analysis_modules/cosmological_observation/light_cone/light_cone.py
+++ b/yt/analysis_modules/cosmological_observation/light_cone/light_cone.py
@@ -26,7 +26,6 @@
from yt.utilities.cosmology import \
Cosmology
from yt.utilities.parallel_tools.parallel_analysis_interface import \
- only_on_root, \
parallel_objects, \
parallel_root_only
from yt.visualization.image_writer import \
diff -r b186d0f32552017f585f691ba9d8413bc01a967d -r 6b95f2a269c34bcbdff3ca212b67ddce1401d9e9 yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -25,7 +25,6 @@
HaloProfiler
from yt.convenience import load
from yt.utilities.parallel_tools.parallel_analysis_interface import \
- only_on_root, \
parallel_objects, \
parallel_root_only
from yt.utilities.physical_constants import \
diff -r b186d0f32552017f585f691ba9d8413bc01a967d -r 6b95f2a269c34bcbdff3ca212b67ddce1401d9e9 yt/frontends/halo_catalogs/api.py
--- a/yt/frontends/halo_catalogs/api.py
+++ b/yt/frontends/halo_catalogs/api.py
@@ -14,12 +14,12 @@
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
-from halo_catalog.api import \
+from .halo_catalog.api import \
HaloCatalogDataset, \
IOHandlerHaloCatalogHDF5, \
HaloCatalogFieldInfo
-from rockstar.api import \
+from .rockstar.api import \
RockstarDataset, \
IOHandlerRockstarBinary, \
RockstarFieldInfo
diff -r b186d0f32552017f585f691ba9d8413bc01a967d -r 6b95f2a269c34bcbdff3ca212b67ddce1401d9e9 yt/frontends/sph/data_structures.py
--- a/yt/frontends/sph/data_structures.py
+++ b/yt/frontends/sph/data_structures.py
@@ -530,7 +530,10 @@
f = open(filename,'rb')
except:
return False, 1
- fs = len(f.read())
+ try:
+ fs = len(f.read())
+ except IOError:
+ return False, 1
f.seek(0)
#Read in the header
t, n, ndim, ng, nd, ns = struct.unpack("<diiiii", f.read(28))
diff -r b186d0f32552017f585f691ba9d8413bc01a967d -r 6b95f2a269c34bcbdff3ca212b67ddce1401d9e9 yt/utilities/lib/setup.py
--- a/yt/utilities/lib/setup.py
+++ b/yt/utilities/lib/setup.py
@@ -100,6 +100,7 @@
config.add_extension("origami",
["yt/utilities/lib/origami.pyx",
"yt/utilities/lib/origami_tags.c"],
+ include_dirs=["yt/utilities/lib/"],
depends=["yt/utilities/lib/origami_tags.h"])
config.add_extension("image_utilities",
["yt/utilities/lib/image_utilities.pyx"],
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list