[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Aug 1 07:59:51 PDT 2017
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/3ac558b63348/
Changeset: 3ac558b63348
User: ngoldbaum
Date: 2017-05-20 13:17:58+00:00
Summary: Fixes for rockstar under python3. closes #1412
Affected #: 2 files
diff -r 71d0f9b7951cd8562f219d1a610d505a6d256873 -r 3ac558b633485e979c0e3676e1b5e6307146d644 yt/analysis_modules/halo_finding/rockstar/rockstar.py
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar.py
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar.py
@@ -325,7 +325,9 @@
self.ts._pre_outputs = self.ts._pre_outputs[restart_num:]
else:
restart_num = 0
- self.handler.setup_rockstar(self.server_address, self.port,
+ self.handler.setup_rockstar(
+ self.server_address.encode('ascii'),
+ self.port.encode('ascii'),
num_outputs, self.total_particles,
self.particle_type,
particle_mass = self.particle_mass,
@@ -334,7 +336,7 @@
num_writers = self.num_writers,
writing_port = -1,
block_ratio = block_ratio,
- outbase = self.outbase,
+ outbase = self.outbase.encode('ascii'),
force_res = self.force_res,
callbacks = callbacks,
restart_num = restart_num,
diff -r 71d0f9b7951cd8562f219d1a610d505a6d256873 -r 3ac558b633485e979c0e3676e1b5e6307146d644 yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
@@ -296,7 +296,7 @@
SCALE_NOW = 1.0/(tds.current_redshift+1.0)
if callbacks is None: callbacks = []
self.callbacks = callbacks
- if not outbase =='None'.decode('UTF-8'):
+ if not outbase == 'None'.encode('UTF-8'):
#output directory. since we can't change the output filenames
#workaround is to make a new directory
OUTBASE = outbase
https://bitbucket.org/yt_analysis/yt/commits/7e1ec9287310/
Changeset: 7e1ec9287310
User: ngoldbaum
Date: 2017-05-20 13:24:45+00:00
Summary: don't use an explicit codec
Affected #: 1 file
diff -r 3ac558b633485e979c0e3676e1b5e6307146d644 -r 7e1ec9287310bf2083814fceafc18f117854e7e2 yt/analysis_modules/halo_finding/rockstar/rockstar.py
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar.py
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar.py
@@ -326,8 +326,8 @@
else:
restart_num = 0
self.handler.setup_rockstar(
- self.server_address.encode('ascii'),
- self.port.encode('ascii'),
+ self.server_address.encode(),
+ self.port.encode(),
num_outputs, self.total_particles,
self.particle_type,
particle_mass = self.particle_mass,
@@ -336,7 +336,7 @@
num_writers = self.num_writers,
writing_port = -1,
block_ratio = block_ratio,
- outbase = self.outbase.encode('ascii'),
+ outbase = self.outbase.encode(),
force_res = self.force_res,
callbacks = callbacks,
restart_num = restart_num,
https://bitbucket.org/yt_analysis/yt/commits/de8aa0a7d048/
Changeset: de8aa0a7d048
User: ngoldbaum
Date: 2017-07-28 14:00:09+00:00
Summary: try kacper suggestion
Affected #: 1 file
diff -r 7e1ec9287310bf2083814fceafc18f117854e7e2 -r de8aa0a7d048b0570a39858c6094e4cf8b95d767 yt/analysis_modules/halo_finding/rockstar/rockstar.py
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar.py
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar.py
@@ -17,6 +17,8 @@
from yt.config import ytcfg
from yt.data_objects.time_series import \
DatasetSeries
+from yt.extern import \
+ six
from yt.funcs import \
is_root, mylog
from yt.utilities.parallel_tools.parallel_analysis_interface import \
@@ -326,8 +328,8 @@
else:
restart_num = 0
self.handler.setup_rockstar(
- self.server_address.encode(),
- self.port.encode(),
+ six.b(self.server_address),
+ six.b(self.port),
num_outputs, self.total_particles,
self.particle_type,
particle_mass = self.particle_mass,
@@ -336,7 +338,7 @@
num_writers = self.num_writers,
writing_port = -1,
block_ratio = block_ratio,
- outbase = self.outbase.encode(),
+ outbase = six.b(self.outbase),
force_res = self.force_res,
callbacks = callbacks,
restart_num = restart_num,
https://bitbucket.org/yt_analysis/yt/commits/43ce1051199f/
Changeset: 43ce1051199f
User: xarthisius
Date: 2017-08-01 14:59:38+00:00
Summary: Merge pull request #1414 from ngoldbaum/rockstar-py3
Fixes for rockstar under python3. closes #1412
Affected #: 2 files
diff -r 995dd2a4b31cc288938fb9dc62faf5e79628dfe8 -r 43ce1051199f158b6b66f6f6a8feea794c92c4c2 yt/analysis_modules/halo_finding/rockstar/rockstar.py
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar.py
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar.py
@@ -17,6 +17,8 @@
from yt.config import ytcfg
from yt.data_objects.time_series import \
DatasetSeries
+from yt.extern import \
+ six
from yt.funcs import \
is_root, mylog
from yt.utilities.parallel_tools.parallel_analysis_interface import \
@@ -325,7 +327,9 @@
self.ts._pre_outputs = self.ts._pre_outputs[restart_num:]
else:
restart_num = 0
- self.handler.setup_rockstar(self.server_address, self.port,
+ self.handler.setup_rockstar(
+ six.b(self.server_address),
+ six.b(self.port),
num_outputs, self.total_particles,
self.particle_type,
particle_mass = self.particle_mass,
@@ -334,7 +338,7 @@
num_writers = self.num_writers,
writing_port = -1,
block_ratio = block_ratio,
- outbase = self.outbase,
+ outbase = six.b(self.outbase),
force_res = self.force_res,
callbacks = callbacks,
restart_num = restart_num,
diff -r 995dd2a4b31cc288938fb9dc62faf5e79628dfe8 -r 43ce1051199f158b6b66f6f6a8feea794c92c4c2 yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
@@ -296,7 +296,7 @@
SCALE_NOW = 1.0/(tds.current_redshift+1.0)
if callbacks is None: callbacks = []
self.callbacks = callbacks
- if not outbase =='None'.decode('UTF-8'):
+ if not outbase == 'None'.encode('UTF-8'):
#output directory. since we can't change the output filenames
#workaround is to make a new directory
OUTBASE = outbase
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