[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Fri Jul 11 08:08:21 PDT 2014
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/59c9352823d9/
Changeset: 59c9352823d9
Branch: yt-3.0
User: jzuhone
Date: 2014-07-10 21:58:47
Summary: This is slowing down the creation of YTArrays if AstroPy is installed, and isn't strictly necessary because we have the from_astropy method.
Affected #: 1 file
diff -r 1657bc359ffcf8a2aebcdd40143449bfc89a6d15 -r 59c9352823d99ce4265739ebe8dcb740417a4747 yt/units/yt_array.py
--- a/yt/units/yt_array.py
+++ b/yt/units/yt_array.py
@@ -251,9 +251,6 @@
"Perhaps you meant to do something like this instead: \n"
"ds.arr(%s, \"%s\")" % (input_array, input_units)
)
- if _astropy.units is not None:
- if isinstance(input_array, _astropy.units.quantity.Quantity):
- return cls.from_astropy(input_array)
if isinstance(input_array, YTArray):
if input_units is None:
if registry is None:
https://bitbucket.org/yt_analysis/yt/commits/e81e62708474/
Changeset: e81e62708474
Branch: yt-3.0
User: jzuhone
Date: 2014-07-10 22:10:39
Summary: Updated docs and tests to reflect the AstroPy conversion change
Affected #: 2 files
diff -r 59c9352823d99ce4265739ebe8dcb740417a4747 -r e81e62708474dbdce8d363d02d10995fb6dd0f4a doc/source/analyzing/units/2)_Data_Selection_and_fields.ipynb
--- a/doc/source/analyzing/units/2)_Data_Selection_and_fields.ipynb
+++ b/doc/source/analyzing/units/2)_Data_Selection_and_fields.ipynb
@@ -1,7 +1,7 @@
{
"metadata": {
"name": "",
- "signature": "sha256:b7541e0167001c6dd74306c8490385ace7bdb0533a829286f0505c0b24c67f16"
+ "signature": "sha256:882b31591c60bfe6ad4cb0f8842953d2e94fb8a12ce742be831a65642eea72c9"
},
"nbformat": 3,
"nbformat_minor": 0,
@@ -325,8 +325,7 @@
"input": [
"from astropy import units as u\n",
"x = 42.0 * u.meter\n",
- "y = YTQuantity(x)\n",
- "y2 = YTQuantity.from_astropy(x) # Another way to create the quantity"
+ "y = YTQuantity.from_astropy(x) "
],
"language": "python",
"metadata": {},
@@ -337,8 +336,7 @@
"collapsed": false,
"input": [
"print x, type(x)\n",
- "print y, type(y)\n",
- "print y2, type(y2)"
+ "print y, type(y)"
],
"language": "python",
"metadata": {},
@@ -349,8 +347,7 @@
"collapsed": false,
"input": [
"a = np.random.random(size=10) * u.km/u.s\n",
- "b = YTArray(a)\n",
- "b2 = YTArray.from_astropy(a) # Another way to create the quantity"
+ "b = YTArray.from_astropy(a)"
],
"language": "python",
"metadata": {},
@@ -361,8 +358,7 @@
"collapsed": false,
"input": [
"print a, type(a)\n",
- "print b, type(b)\n",
- "print b2, type(b2)"
+ "print b, type(b)"
],
"language": "python",
"metadata": {},
@@ -438,7 +434,7 @@
"collapsed": false,
"input": [
"k1 = kboltz.to_astropy()\n",
- "k2 = YTQuantity(kb)\n",
+ "k2 = YTQuantity.from_astropy(kb)\n",
"print k1 == k2"
],
"language": "python",
@@ -449,7 +445,7 @@
"cell_type": "code",
"collapsed": false,
"input": [
- "c = YTArray(a)\n",
+ "c = YTArray.from_astropy(a)\n",
"d = c.to_astropy()\n",
"print a == d"
],
diff -r 59c9352823d99ce4265739ebe8dcb740417a4747 -r e81e62708474dbdce8d363d02d10995fb6dd0f4a yt/units/tests/test_ytarray.py
--- a/yt/units/tests/test_ytarray.py
+++ b/yt/units/tests/test_ytarray.py
@@ -641,14 +641,14 @@
yt_quan2 = YTQuantity.from_astropy(ap_quan)
yield assert_array_equal, ap_arr, yt_arr.to_astropy()
- yield assert_array_equal, yt_arr, YTArray(ap_arr)
+ yield assert_array_equal, yt_arr, YTArray.from_astropy(ap_arr)
yield assert_array_equal, yt_arr, yt_arr2
yield assert_equal, ap_quan, yt_quan.to_astropy()
- yield assert_equal, yt_quan, YTQuantity(ap_quan)
+ yield assert_equal, yt_quan, YTQuantity.from_astropy(ap_quan)
yield assert_equal, yt_quan, yt_quan2
- yield assert_array_equal, yt_arr, YTArray(yt_arr.to_astropy())
- yield assert_equal, yt_quan, YTQuantity(yt_quan.to_astropy())
+ yield assert_array_equal, yt_arr, YTArray.from_astropy(yt_arr.to_astropy())
+ yield assert_equal, yt_quan, YTQuantity.from_astropy(yt_quan.to_astropy())
https://bitbucket.org/yt_analysis/yt/commits/14dfbdf28b07/
Changeset: 14dfbdf28b07
Branch: yt-3.0
User: jzuhone
Date: 2014-07-10 22:14:06
Summary: Merge
Affected #: 3 files
diff -r 1b364c80fa285211a0ba828e88e683201c58440d -r 14dfbdf28b07dd18e112abafce364d04a4864829 doc/source/analyzing/units/2)_Data_Selection_and_fields.ipynb
--- a/doc/source/analyzing/units/2)_Data_Selection_and_fields.ipynb
+++ b/doc/source/analyzing/units/2)_Data_Selection_and_fields.ipynb
@@ -1,7 +1,7 @@
{
"metadata": {
"name": "",
- "signature": "sha256:b7541e0167001c6dd74306c8490385ace7bdb0533a829286f0505c0b24c67f16"
+ "signature": "sha256:882b31591c60bfe6ad4cb0f8842953d2e94fb8a12ce742be831a65642eea72c9"
},
"nbformat": 3,
"nbformat_minor": 0,
@@ -325,8 +325,7 @@
"input": [
"from astropy import units as u\n",
"x = 42.0 * u.meter\n",
- "y = YTQuantity(x)\n",
- "y2 = YTQuantity.from_astropy(x) # Another way to create the quantity"
+ "y = YTQuantity.from_astropy(x) "
],
"language": "python",
"metadata": {},
@@ -337,8 +336,7 @@
"collapsed": false,
"input": [
"print x, type(x)\n",
- "print y, type(y)\n",
- "print y2, type(y2)"
+ "print y, type(y)"
],
"language": "python",
"metadata": {},
@@ -349,8 +347,7 @@
"collapsed": false,
"input": [
"a = np.random.random(size=10) * u.km/u.s\n",
- "b = YTArray(a)\n",
- "b2 = YTArray.from_astropy(a) # Another way to create the quantity"
+ "b = YTArray.from_astropy(a)"
],
"language": "python",
"metadata": {},
@@ -361,8 +358,7 @@
"collapsed": false,
"input": [
"print a, type(a)\n",
- "print b, type(b)\n",
- "print b2, type(b2)"
+ "print b, type(b)"
],
"language": "python",
"metadata": {},
@@ -438,7 +434,7 @@
"collapsed": false,
"input": [
"k1 = kboltz.to_astropy()\n",
- "k2 = YTQuantity(kb)\n",
+ "k2 = YTQuantity.from_astropy(kb)\n",
"print k1 == k2"
],
"language": "python",
@@ -449,7 +445,7 @@
"cell_type": "code",
"collapsed": false,
"input": [
- "c = YTArray(a)\n",
+ "c = YTArray.from_astropy(a)\n",
"d = c.to_astropy()\n",
"print a == d"
],
diff -r 1b364c80fa285211a0ba828e88e683201c58440d -r 14dfbdf28b07dd18e112abafce364d04a4864829 yt/units/tests/test_ytarray.py
--- a/yt/units/tests/test_ytarray.py
+++ b/yt/units/tests/test_ytarray.py
@@ -746,15 +746,15 @@
yt_quan2 = YTQuantity.from_astropy(ap_quan)
yield assert_array_equal, ap_arr, yt_arr.to_astropy()
- yield assert_array_equal, yt_arr, YTArray(ap_arr)
+ yield assert_array_equal, yt_arr, YTArray.from_astropy(ap_arr)
yield assert_array_equal, yt_arr, yt_arr2
yield assert_equal, ap_quan, yt_quan.to_astropy()
- yield assert_equal, yt_quan, YTQuantity(ap_quan)
+ yield assert_equal, yt_quan, YTQuantity.from_astropy(ap_quan)
yield assert_equal, yt_quan, yt_quan2
- yield assert_array_equal, yt_arr, YTArray(yt_arr.to_astropy())
- yield assert_equal, yt_quan, YTQuantity(yt_quan.to_astropy())
+ yield assert_array_equal, yt_arr, YTArray.from_astropy(yt_arr.to_astropy())
+ yield assert_equal, yt_quan, YTQuantity.from_astropy(yt_quan.to_astropy())
def test_subclass():
diff -r 1b364c80fa285211a0ba828e88e683201c58440d -r 14dfbdf28b07dd18e112abafce364d04a4864829 yt/units/yt_array.py
--- a/yt/units/yt_array.py
+++ b/yt/units/yt_array.py
@@ -323,9 +323,6 @@
"Perhaps you meant to do something like this instead: \n"
"ds.arr(%s, \"%s\")" % (input_array, input_units)
)
- if _astropy._units is not None:
- if isinstance(input_array, _astropy.units.quantity.Quantity):
- return cls.from_astropy(input_array)
if isinstance(input_array, YTArray):
if input_units is None:
if registry is None:
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