[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Mar 15 14:46:30 PDT 2016
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/cb2f4bf53403/
Changeset: cb2f4bf53403
Branch: yt
User: xarthisius
Date: 2016-03-15 02:06:15+00:00
Summary: Convert absorption_spectrum tests to answer tests
Affected #: 2 files
diff -r 9c26b97915111f171177465e79d6381aae16d4f0 -r cb2f4bf534032fc77505cd16c7acabcb1265a7ea tests/tests_2.7.yaml
--- a/tests/tests_2.7.yaml
+++ b/tests/tests_2.7.yaml
@@ -55,6 +55,10 @@
local_ytdata_270:
- yt/frontends/ytdata
+ local_abspec_270:
+ - yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py:test_absorption_spectrum_non_cosmo
+ - yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py:test_absorption_spectrum_cosmo
+
other_tests:
unittests:
- '-v'
diff -r 9c26b97915111f171177465e79d6381aae16d4f0 -r cb2f4bf534032fc77505cd16c7acabcb1265a7ea yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
--- a/yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
+++ b/yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
@@ -13,34 +13,31 @@
import numpy as np
from yt.testing import \
assert_allclose_units, requires_file, requires_module, \
- assert_almost_equal, assert_array_almost_equal
+ assert_almost_equal
from yt.analysis_modules.absorption_spectrum.absorption_line import \
voigt_old, voigt_scipy
from yt.analysis_modules.absorption_spectrum.api import AbsorptionSpectrum
from yt.analysis_modules.cosmological_observation.api import LightRay
-from yt.config import ytcfg
+from yt.utilities.answer_testing.framework import \
+ GenericArrayTest, \
+ requires_answer_testing
import tempfile
import os
import shutil
from yt.utilities.on_demand_imports import \
_h5py as h5
-test_dir = ytcfg.get("yt", "test_data_dir")
COSMO_PLUS = "enzo_cosmology_plus/AMRCosmology.enzo"
COSMO_PLUS_SINGLE = "enzo_cosmology_plus/RD0009/RD0009"
-HI_SPECTRUM_COSMO = "absorption_spectrum_data/enzo_lyman_alpha_cosmo_spec.h5"
-HI_SPECTRUM_COSMO_FILE = os.path.join(test_dir, HI_SPECTRUM_COSMO)
-HI_SPECTRUM = "absorption_spectrum_data/enzo_lyman_alpha_spec.h5"
-HI_SPECTRUM_FILE = os.path.join(test_dir, HI_SPECTRUM)
+
@requires_file(COSMO_PLUS)
- at requires_file(HI_SPECTRUM_COSMO)
+ at requires_answer_testing()
def test_absorption_spectrum_cosmo():
"""
This test generates an absorption spectrum from a cosmological light ray
"""
-
# Set up in a temp dir
tmpdir = tempfile.mkdtemp()
curdir = os.getcwd()
@@ -78,22 +75,21 @@
use_peculiar_velocity=True)
# load just-generated hdf5 file of spectral data (for consistency)
- f_new = h5.File('spectrum.h5', 'r')
+ data = h5.File('spectrum.h5', 'r')
- # load standard data for comparison
- f_old = h5.File(HI_SPECTRUM_COSMO_FILE, 'r')
-
- # compare between standard data and current data for each array saved
- # (wavelength, flux, tau)
- for key in f_old.keys():
- assert_array_almost_equal(f_new[key].value, f_old[key].value, 10)
+ for key in data.keys():
+ func = lambda x=key: data[x][:]
+ func.__name__ = "{}_cosmo".format(key)
+ test = GenericArrayTest(None, func)
+ test_absorption_spectrum_cosmo.__name__ = test.description
+ yield test
# clean up
os.chdir(curdir)
shutil.rmtree(tmpdir)
@requires_file(COSMO_PLUS_SINGLE)
- at requires_file(HI_SPECTRUM)
+ at requires_answer_testing()
def test_absorption_spectrum_non_cosmo():
"""
This test generates an absorption spectrum from a non-cosmological light ray
@@ -130,15 +126,14 @@
use_peculiar_velocity=True)
# load just-generated hdf5 file of spectral data (for consistency)
- f_new = h5.File('spectrum.h5', 'r')
-
- # load standard data for comparison
- f_old = h5.File(HI_SPECTRUM_FILE, 'r')
-
- # compare between standard data and current data for each array saved
- # (wavelength, flux, tau)
- for key in f_old.keys():
- assert_array_almost_equal(f_new[key].value, f_old[key].value, 10)
+ data = h5.File('spectrum.h5', 'r')
+
+ for key in data.keys():
+ func = lambda x=key: data[x][:]
+ func.__name__ = "{}_non_cosmo".format(key)
+ test = GenericArrayTest(None, func)
+ test_absorption_spectrum_cosmo.__name__ = test.description
+ yield test
# clean up
os.chdir(curdir)
https://bitbucket.org/yt_analysis/yt/commits/a73be5470f1f/
Changeset: a73be5470f1f
Branch: yt
User: xarthisius
Date: 2016-03-15 13:05:16+00:00
Summary: Fix typo in test description. Regenerate answers since it changes their names
Affected #: 2 files
diff -r cb2f4bf534032fc77505cd16c7acabcb1265a7ea -r a73be5470f1fc6903efe2b73d8502ede38ada265 tests/tests_2.7.yaml
--- a/tests/tests_2.7.yaml
+++ b/tests/tests_2.7.yaml
@@ -55,7 +55,7 @@
local_ytdata_270:
- yt/frontends/ytdata
- local_abspec_270:
+ local_absorption_spectrum_270:
- yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py:test_absorption_spectrum_non_cosmo
- yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py:test_absorption_spectrum_cosmo
diff -r cb2f4bf534032fc77505cd16c7acabcb1265a7ea -r a73be5470f1fc6903efe2b73d8502ede38ada265 yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
--- a/yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
+++ b/yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
@@ -132,7 +132,7 @@
func = lambda x=key: data[x][:]
func.__name__ = "{}_non_cosmo".format(key)
test = GenericArrayTest(None, func)
- test_absorption_spectrum_cosmo.__name__ = test.description
+ test_absorption_spectrum_non_cosmo.__name__ = test.description
yield test
# clean up
https://bitbucket.org/yt_analysis/yt/commits/2c4566405904/
Changeset: 2c4566405904
Branch: yt
User: ngoldbaum
Date: 2016-03-15 21:46:18+00:00
Summary: Merged in xarthisius/yt (pull request #2041)
Convert absorption_spectrum tests to answer tests
Affected #: 2 files
diff -r 81d517a65dfc0046e3eddc24c86a987bc9cf0f43 -r 2c45664059047b42c76fbccb4da5831f86f173bc tests/tests_2.7.yaml
--- a/tests/tests_2.7.yaml
+++ b/tests/tests_2.7.yaml
@@ -55,6 +55,10 @@
local_ytdata_270:
- yt/frontends/ytdata
+ local_absorption_spectrum_270:
+ - yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py:test_absorption_spectrum_non_cosmo
+ - yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py:test_absorption_spectrum_cosmo
+
other_tests:
unittests:
- '-v'
diff -r 81d517a65dfc0046e3eddc24c86a987bc9cf0f43 -r 2c45664059047b42c76fbccb4da5831f86f173bc yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
--- a/yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
+++ b/yt/analysis_modules/absorption_spectrum/tests/test_absorption_spectrum.py
@@ -13,34 +13,31 @@
import numpy as np
from yt.testing import \
assert_allclose_units, requires_file, requires_module, \
- assert_almost_equal, assert_array_almost_equal
+ assert_almost_equal
from yt.analysis_modules.absorption_spectrum.absorption_line import \
voigt_old, voigt_scipy
from yt.analysis_modules.absorption_spectrum.api import AbsorptionSpectrum
from yt.analysis_modules.cosmological_observation.api import LightRay
-from yt.config import ytcfg
+from yt.utilities.answer_testing.framework import \
+ GenericArrayTest, \
+ requires_answer_testing
import tempfile
import os
import shutil
from yt.utilities.on_demand_imports import \
_h5py as h5
-test_dir = ytcfg.get("yt", "test_data_dir")
COSMO_PLUS = "enzo_cosmology_plus/AMRCosmology.enzo"
COSMO_PLUS_SINGLE = "enzo_cosmology_plus/RD0009/RD0009"
-HI_SPECTRUM_COSMO = "absorption_spectrum_data/enzo_lyman_alpha_cosmo_spec.h5"
-HI_SPECTRUM_COSMO_FILE = os.path.join(test_dir, HI_SPECTRUM_COSMO)
-HI_SPECTRUM = "absorption_spectrum_data/enzo_lyman_alpha_spec.h5"
-HI_SPECTRUM_FILE = os.path.join(test_dir, HI_SPECTRUM)
+
@requires_file(COSMO_PLUS)
- at requires_file(HI_SPECTRUM_COSMO)
+ at requires_answer_testing()
def test_absorption_spectrum_cosmo():
"""
This test generates an absorption spectrum from a cosmological light ray
"""
-
# Set up in a temp dir
tmpdir = tempfile.mkdtemp()
curdir = os.getcwd()
@@ -78,22 +75,21 @@
use_peculiar_velocity=True)
# load just-generated hdf5 file of spectral data (for consistency)
- f_new = h5.File('spectrum.h5', 'r')
+ data = h5.File('spectrum.h5', 'r')
- # load standard data for comparison
- f_old = h5.File(HI_SPECTRUM_COSMO_FILE, 'r')
-
- # compare between standard data and current data for each array saved
- # (wavelength, flux, tau)
- for key in f_old.keys():
- assert_array_almost_equal(f_new[key].value, f_old[key].value, 10)
+ for key in data.keys():
+ func = lambda x=key: data[x][:]
+ func.__name__ = "{}_cosmo".format(key)
+ test = GenericArrayTest(None, func)
+ test_absorption_spectrum_cosmo.__name__ = test.description
+ yield test
# clean up
os.chdir(curdir)
shutil.rmtree(tmpdir)
@requires_file(COSMO_PLUS_SINGLE)
- at requires_file(HI_SPECTRUM)
+ at requires_answer_testing()
def test_absorption_spectrum_non_cosmo():
"""
This test generates an absorption spectrum from a non-cosmological light ray
@@ -130,15 +126,14 @@
use_peculiar_velocity=True)
# load just-generated hdf5 file of spectral data (for consistency)
- f_new = h5.File('spectrum.h5', 'r')
-
- # load standard data for comparison
- f_old = h5.File(HI_SPECTRUM_FILE, 'r')
-
- # compare between standard data and current data for each array saved
- # (wavelength, flux, tau)
- for key in f_old.keys():
- assert_array_almost_equal(f_new[key].value, f_old[key].value, 10)
+ data = h5.File('spectrum.h5', 'r')
+
+ for key in data.keys():
+ func = lambda x=key: data[x][:]
+ func.__name__ = "{}_non_cosmo".format(key)
+ test = GenericArrayTest(None, func)
+ test_absorption_spectrum_non_cosmo.__name__ = test.description
+ yield test
# clean up
os.chdir(curdir)
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