[yt-svn] commit/yt: 3 new changesets

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/3ef09ad8d6cd/
Changeset:   3ef09ad8d6cd
User:        ngoldbaum
Date:        2017-09-18 21:09:35+00:00
Summary:     Decorate two tests that depend on h5py with requires_module('h5py')
Affected #:  2 files

diff -r fccca1fb4d585d705867a553e7fd5ec94ac7181d -r 3ef09ad8d6cdedbe4d874b7c2e7315164cf4f432 yt/frontends/ytdata/tests/test_outputs.py
--- a/yt/frontends/ytdata/tests/test_outputs.py
+++ b/yt/frontends/ytdata/tests/test_outputs.py
@@ -28,7 +28,8 @@
     assert_allclose_units, \
     assert_equal, \
     assert_fname, \
-    fake_random_ds
+    fake_random_ds, \
+    requires_module
 from yt.utilities.answer_testing.framework import \
     requires_ds, \
     data_dir_load, \
@@ -229,6 +230,7 @@
     os.chdir(curdir)
     shutil.rmtree(tmpdir)
 
+ at requires_module('h5py')
 def test_plot_data():
     tmpdir = tempfile.mkdtemp()
     curdir = os.getcwd()

diff -r fccca1fb4d585d705867a553e7fd5ec94ac7181d -r 3ef09ad8d6cdedbe4d874b7c2e7315164cf4f432 yt/utilities/grid_data_format/tests/test_writer.py
--- a/yt/utilities/grid_data_format/tests/test_writer.py
+++ b/yt/utilities/grid_data_format/tests/test_writer.py
@@ -17,7 +17,9 @@
 import os
 from yt.utilities.on_demand_imports import _h5py as h5
 from yt.testing import \
-    fake_random_ds, assert_equal
+    fake_random_ds, \
+    assert_equal, \
+    requires_module
 from yt.utilities.grid_data_format.writer import \
     write_to_gdf
 from yt.frontends.gdf.data_structures import \
@@ -35,6 +37,7 @@
     ytcfg["yt", "__withintesting"] = "True"
 
 
+ at requires_module('h5py')
 def test_write_gdf():
     """Main test suite for write_gdf"""
     tmpdir = tempfile.mkdtemp()


https://bitbucket.org/yt_analysis/yt/commits/ff291b3cb49d/
Changeset:   ff291b3cb49d
User:        ngoldbaum
Date:        2017-09-18 21:10:13+00:00
Summary:     don't run flake8 on minimal travis py27 builds
Affected #:  1 file

diff -r 3ef09ad8d6cdedbe4d874b7c2e7315164cf4f432 -r ff291b3cb49d39c97b3af091fb537e7f95d2c6a6 .travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,12 @@
     SCIPY=scipy
     IPYTHON=ipython
     FASTCACHE=fastcache
+    FLAKE8=flake8
 
 matrix:
   include:
     - python: 2.7
-      env: NUMPY=numpy==1.10.4 CYTHON=cython==0.24 MATPLOTLIB=matplotlib==1.5.3 SYMPY=sympy==1.0 H5PY= SCIPY= FASTCACHE= IPYTHON=ipython==1.0
+      env: NUMPY=numpy==1.10.4 CYTHON=cython==0.24 MATPLOTLIB=matplotlib==1.5.3 SYMPY=sympy==1.0 H5PY= SCIPY= FASTCACHE= FLAKE8= IPYTHON=ipython==1.0
     - python: 2.7
     - python: 3.4
     - python: 3.5
@@ -65,7 +66,7 @@
     pip install --upgrade wheel
     pip install --upgrade setuptools
     # Install dependencies
-    pip install mock $NUMPY $SCIPY $H5PY $CYTHON $MATPLOTLIB $SYMPY $FASTCACHE $IPYTHON nose flake8 nose-timer
+    pip install mock $NUMPY $SCIPY $H5PY $CYTHON $MATPLOTLIB $SYMPY $FASTCACHE $IPYTHON $FLAKE8 nose nose-timer
     # install yt
     pip install -e .
 


https://bitbucket.org/yt_analysis/yt/commits/06a7445d0c86/
Changeset:   06a7445d0c86
User:        xarthisius
Date:        2017-09-19 13:43:17+00:00
Summary:     Merge pull request #1561 from ngoldbaum/py2-fixes

Travis fixes
Affected #:  3 files

diff -r 0552159e1ffc1d2caa3d29e446aa3d78d5218e4f -r 06a7445d0c8649ba95211539cf71829d9d0b298b .travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,12 @@
     SCIPY=scipy
     IPYTHON=ipython
     FASTCACHE=fastcache
+    FLAKE8=flake8
 
 matrix:
   include:
     - python: 2.7
-      env: NUMPY=numpy==1.10.4 CYTHON=cython==0.24 MATPLOTLIB=matplotlib==1.5.3 SYMPY=sympy==1.0 H5PY= SCIPY= FASTCACHE= IPYTHON=ipython==1.0
+      env: NUMPY=numpy==1.10.4 CYTHON=cython==0.24 MATPLOTLIB=matplotlib==1.5.3 SYMPY=sympy==1.0 H5PY= SCIPY= FASTCACHE= FLAKE8= IPYTHON=ipython==1.0
     - python: 2.7
     - python: 3.4
     - python: 3.5
@@ -65,7 +66,7 @@
     pip install --upgrade wheel
     pip install --upgrade setuptools
     # Install dependencies
-    pip install mock $NUMPY $SCIPY $H5PY $CYTHON $MATPLOTLIB $SYMPY $FASTCACHE $IPYTHON nose flake8 nose-timer
+    pip install mock $NUMPY $SCIPY $H5PY $CYTHON $MATPLOTLIB $SYMPY $FASTCACHE $IPYTHON $FLAKE8 nose nose-timer
     # install yt
     pip install -e .
 

diff -r 0552159e1ffc1d2caa3d29e446aa3d78d5218e4f -r 06a7445d0c8649ba95211539cf71829d9d0b298b yt/frontends/ytdata/tests/test_outputs.py
--- a/yt/frontends/ytdata/tests/test_outputs.py
+++ b/yt/frontends/ytdata/tests/test_outputs.py
@@ -28,7 +28,8 @@
     assert_allclose_units, \
     assert_equal, \
     assert_fname, \
-    fake_random_ds
+    fake_random_ds, \
+    requires_module
 from yt.utilities.answer_testing.framework import \
     requires_ds, \
     data_dir_load, \
@@ -229,6 +230,7 @@
     os.chdir(curdir)
     shutil.rmtree(tmpdir)
 
+ at requires_module('h5py')
 def test_plot_data():
     tmpdir = tempfile.mkdtemp()
     curdir = os.getcwd()

diff -r 0552159e1ffc1d2caa3d29e446aa3d78d5218e4f -r 06a7445d0c8649ba95211539cf71829d9d0b298b yt/utilities/grid_data_format/tests/test_writer.py
--- a/yt/utilities/grid_data_format/tests/test_writer.py
+++ b/yt/utilities/grid_data_format/tests/test_writer.py
@@ -17,7 +17,9 @@
 import os
 from yt.utilities.on_demand_imports import _h5py as h5
 from yt.testing import \
-    fake_random_ds, assert_equal
+    fake_random_ds, \
+    assert_equal, \
+    requires_module
 from yt.utilities.grid_data_format.writer import \
     write_to_gdf
 from yt.frontends.gdf.data_structures import \
@@ -35,6 +37,7 @@
     ytcfg["yt", "__withintesting"] = "True"
 
 
+ at requires_module('h5py')
 def test_write_gdf():
     """Main test suite for write_gdf"""
     tmpdir = tempfile.mkdtemp()

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.