[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Feb 13 09:23:34 PST 2018
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/eebb1e3a1e0a/
Changeset: eebb1e3a1e0a
User: ngoldbaum
Date: 2018-02-12 22:46:07+00:00
Summary: fix warnings generated by the plotting tests
Affected #: 3 files
diff -r 5d623ec12aebc9d3815c6b3d59099c30f9db2d27 -r eebb1e3a1e0ac33957d6744b5313e6789dfd860b yt/utilities/on_demand_imports.py
--- a/yt/utilities/on_demand_imports.py
+++ b/yt/utilities/on_demand_imports.py
@@ -134,6 +134,18 @@
self._wcsaxes = wcsaxes
return self._wcsaxes
+ _version = None
+ @property
+ def __version__(self):
+ if self._version is None:
+ try:
+ import astropy
+ version = astropy.__version__
+ except ImportError:
+ version = NotAModule(self._name)
+ self._version = version
+ return self._version
+
_astropy = astropy_imports()
class scipy_imports(object):
diff -r 5d623ec12aebc9d3815c6b3d59099c30f9db2d27 -r eebb1e3a1e0ac33957d6744b5313e6789dfd860b yt/visualization/fits_image.py
--- a/yt/visualization/fits_image.py
+++ b/yt/visualization/fits_image.py
@@ -11,6 +11,7 @@
#-----------------------------------------------------------------------------
from yt.extern.six import string_types
import numpy as np
+from distutils.version import LooseVersion
from yt.fields.derived_field import DerivedField
from yt.funcs import mylog, iterable, fix_axis, ensure_list
from yt.visualization.fixed_resolution import FixedResolutionBuffer
@@ -339,7 +340,10 @@
hdus = _astropy.pyfits.HDUList()
for field in fields:
hdus.append(self.hdulist[field])
- hdus.writeto(fileobj, clobber=clobber, **kwargs)
+ if LooseVersion(_astropy.__version__) < LooseVersion('2.0.0'):
+ hdus.writeto(fileobj, clobber=clobber, **kwargs)
+ else:
+ hdus.writeto(fileobj, overwrite=clobber, **kwargs)
def to_glue(self, label="yt", data_collection=None):
"""
diff -r 5d623ec12aebc9d3815c6b3d59099c30f9db2d27 -r eebb1e3a1e0ac33957d6744b5313e6789dfd860b yt/visualization/tests/test_callbacks.py
--- a/yt/visualization/tests/test_callbacks.py
+++ b/yt/visualization/tests/test_callbacks.py
@@ -471,7 +471,7 @@
p = SlicePlot(ds, "x", "density")
p.annotate_contour("temperature", ncont=10, factor=8,
take_log=False, clim=(0.4, 0.6),
- plot_args={'lw':2.0}, label=True,
+ plot_args={'linewidths':2.0}, label=True,
text_args={'text-size':'x-large'})
p.save(prefix)
@@ -479,7 +479,7 @@
s2 = ds.slice(0, 0.2)
p.annotate_contour("temperature", ncont=10, factor=8,
take_log=False, clim=(0.4, 0.6),
- plot_args={'lw':2.0}, label=True,
+ plot_args={'linewidths':2.0}, label=True,
text_args={'text-size':'x-large'},
data_source=s2)
p.save(prefix)
@@ -503,7 +503,7 @@
p = SlicePlot(ds, "r", "density")
p.annotate_contour("temperature", ncont=10, factor=8,
take_log=False, clim=(0.4, 0.6),
- plot_args={'lw':2.0}, label=True,
+ plot_args={'linewidths':2.0}, label=True,
text_args={'text-size':'x-large'})
assert_raises(YTDataTypeUnsupported, p.save, prefix)
https://bitbucket.org/yt_analysis/yt/commits/ffba2ff1c63f/
Changeset: ffba2ff1c63f
User: ngoldbaum
Date: 2018-02-13 17:23:18+00:00
Summary: Merge pull request #1694 from ngoldbaum/depr-warnings
fix warnings generated by the plotting tests
Affected #: 3 files
diff -r de61f06948242a40f5b06008d7f1a0cbe790875c -r ffba2ff1c63f63e473971a037abdbd637349b7d6 yt/utilities/on_demand_imports.py
--- a/yt/utilities/on_demand_imports.py
+++ b/yt/utilities/on_demand_imports.py
@@ -134,6 +134,18 @@
self._wcsaxes = wcsaxes
return self._wcsaxes
+ _version = None
+ @property
+ def __version__(self):
+ if self._version is None:
+ try:
+ import astropy
+ version = astropy.__version__
+ except ImportError:
+ version = NotAModule(self._name)
+ self._version = version
+ return self._version
+
_astropy = astropy_imports()
class scipy_imports(object):
diff -r de61f06948242a40f5b06008d7f1a0cbe790875c -r ffba2ff1c63f63e473971a037abdbd637349b7d6 yt/visualization/fits_image.py
--- a/yt/visualization/fits_image.py
+++ b/yt/visualization/fits_image.py
@@ -11,6 +11,7 @@
#-----------------------------------------------------------------------------
from yt.extern.six import string_types
import numpy as np
+from distutils.version import LooseVersion
from yt.fields.derived_field import DerivedField
from yt.funcs import mylog, iterable, fix_axis, ensure_list
from yt.visualization.fixed_resolution import FixedResolutionBuffer
@@ -339,7 +340,10 @@
hdus = _astropy.pyfits.HDUList()
for field in fields:
hdus.append(self.hdulist[field])
- hdus.writeto(fileobj, clobber=clobber, **kwargs)
+ if LooseVersion(_astropy.__version__) < LooseVersion('2.0.0'):
+ hdus.writeto(fileobj, clobber=clobber, **kwargs)
+ else:
+ hdus.writeto(fileobj, overwrite=clobber, **kwargs)
def to_glue(self, label="yt", data_collection=None):
"""
diff -r de61f06948242a40f5b06008d7f1a0cbe790875c -r ffba2ff1c63f63e473971a037abdbd637349b7d6 yt/visualization/tests/test_callbacks.py
--- a/yt/visualization/tests/test_callbacks.py
+++ b/yt/visualization/tests/test_callbacks.py
@@ -471,7 +471,7 @@
p = SlicePlot(ds, "x", "density")
p.annotate_contour("temperature", ncont=10, factor=8,
take_log=False, clim=(0.4, 0.6),
- plot_args={'lw':2.0}, label=True,
+ plot_args={'linewidths':2.0}, label=True,
text_args={'text-size':'x-large'})
p.save(prefix)
@@ -479,7 +479,7 @@
s2 = ds.slice(0, 0.2)
p.annotate_contour("temperature", ncont=10, factor=8,
take_log=False, clim=(0.4, 0.6),
- plot_args={'lw':2.0}, label=True,
+ plot_args={'linewidths':2.0}, label=True,
text_args={'text-size':'x-large'},
data_source=s2)
p.save(prefix)
@@ -503,7 +503,7 @@
p = SlicePlot(ds, "r", "density")
p.annotate_contour("temperature", ncont=10, factor=8,
take_log=False, clim=(0.4, 0.6),
- plot_args={'lw':2.0}, label=True,
+ plot_args={'linewidths':2.0}, label=True,
text_args={'text-size':'x-large'})
assert_raises(YTDataTypeUnsupported, p.save, prefix)
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