You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2015/03/19 15:18:58 UTC
[1/8] climate git commit: CLIMATE-605 - Fix typo in
plotter.draw_contour_map docstring
Repository: climate
Updated Branches:
refs/heads/master dca99e085 -> 6725431fb
CLIMATE-605 - Fix typo in plotter.draw_contour_map docstring
- Update plotter.draw_contour_map docstring to specify proper expected
data shape.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/db52b757
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/db52b757
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/db52b757
Branch: refs/heads/master
Commit: db52b75755c3281507dcac46387249a174e546dc
Parents: a0f0615
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Mar 18 08:58:22 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Mar 18 08:58:22 2015 -0700
----------------------------------------------------------------------
ocw/plotter.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/db52b757/ocw/plotter.py
----------------------------------------------------------------------
diff --git a/ocw/plotter.py b/ocw/plotter.py
index 337cfd3..a9c0b7f 100644
--- a/ocw/plotter.py
+++ b/ocw/plotter.py
@@ -494,7 +494,7 @@ def draw_contour_map(dataset, lats, lons, fname, fmt='png', gridshape=(1, 1),
extend='neither', aspect=8.5/2.5):
''' Draw a multiple panel contour map plot.
- :param dataset: 3D array of data to be plotted with shape (nT, nLon, nLat).
+ :param dataset: 3D array of data to be plotted with shape (nT, nLat, nLon).
:type dataset: :class:`numpy.ndarray`
:param lats: Array of latitudes values.
[2/8] climate git commit: CLIMATE-606 - Fix indices misspellings in
config parser code
Posted by jo...@apache.org.
CLIMATE-606 - Fix indices misspellings in config parser code
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/66b08b6a
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/66b08b6a
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/66b08b6a
Branch: refs/heads/master
Commit: 66b08b6aab417de18fa737b9188ef95656000c2c
Parents: dca99e0
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Mar 18 11:15:00 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Mar 18 11:15:00 2015 -0700
----------------------------------------------------------------------
ocw-config-runner/configuration_parsing.py | 2 +-
ocw-config-runner/example/simple_model_to_model_bias.yaml | 2 +-
ocw-config-runner/plot_generation.py | 2 +-
ocw-config-runner/tests/test_config_parsing.py | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/66b08b6a/ocw-config-runner/configuration_parsing.py
----------------------------------------------------------------------
diff --git a/ocw-config-runner/configuration_parsing.py b/ocw-config-runner/configuration_parsing.py
index 43285f7..477488e 100644
--- a/ocw-config-runner/configuration_parsing.py
+++ b/ocw-config-runner/configuration_parsing.py
@@ -202,7 +202,7 @@ def _valid_plot_config_data(plot_config_data):
if plot_type == 'contour':
required_keys = set([
- 'results_indeces',
+ 'results_indices',
'lats',
'lons',
'output_name'
http://git-wip-us.apache.org/repos/asf/climate/blob/66b08b6a/ocw-config-runner/example/simple_model_to_model_bias.yaml
----------------------------------------------------------------------
diff --git a/ocw-config-runner/example/simple_model_to_model_bias.yaml b/ocw-config-runner/example/simple_model_to_model_bias.yaml
index fe2cd36..bd59fbd 100644
--- a/ocw-config-runner/example/simple_model_to_model_bias.yaml
+++ b/ocw-config-runner/example/simple_model_to_model_bias.yaml
@@ -20,7 +20,7 @@ metrics:
plots:
- type: contour
- results_indeces:
+ results_indices:
- !!python/tuple [0, 0]
lats:
range_min: -20
http://git-wip-us.apache.org/repos/asf/climate/blob/66b08b6a/ocw-config-runner/plot_generation.py
----------------------------------------------------------------------
diff --git a/ocw-config-runner/plot_generation.py b/ocw-config-runner/plot_generation.py
index 5d24f49..2a74878 100644
--- a/ocw-config-runner/plot_generation.py
+++ b/ocw-config-runner/plot_generation.py
@@ -63,7 +63,7 @@ def _draw_contour_plot(evaluation, plot_config):
lons = range(lons['range_min'], lons['range_max'], lons['range_step'])
- for i, (row, col) in enumerate(plot_config['results_indeces']):
+ for i, (row, col) in enumerate(plot_config['results_indices']):
plot_name = plot_config['output_name'] + '_{}'.format(i)
plots.draw_contour_map(evaluation.results[row][col],
np.array(lats),
http://git-wip-us.apache.org/repos/asf/climate/blob/66b08b6a/ocw-config-runner/tests/test_config_parsing.py
----------------------------------------------------------------------
diff --git a/ocw-config-runner/tests/test_config_parsing.py b/ocw-config-runner/tests/test_config_parsing.py
index 36ef9be..077e8e7 100644
--- a/ocw-config-runner/tests/test_config_parsing.py
+++ b/ocw-config-runner/tests/test_config_parsing.py
@@ -599,7 +599,7 @@ class ContourMapConfig(unittest.TestCase):
def setUpClass(self):
valid_contour_config = """
type: contour
- results_indeces:
+ results_indices:
- !!python/tuple [0, 0]
lats:
range_min: -20
@@ -619,7 +619,7 @@ class ContourMapConfig(unittest.TestCase):
self.missing_keys_contour = yaml.load(missing_keys_contour_config)
self.required_contour_keys = set([
- 'results_indeces',
+ 'results_indices',
'lats',
'lons',
'output_name'
@@ -653,7 +653,7 @@ class TestInvalidPlotConfig(unittest.TestCase):
self.bad_plot_type = yaml.load(bad_plot_type_config)
missing_plot_type_config = """
- results_indeces:
+ results_indices:
- !!python/tuple [0, 0]
lats:
range_min: -20
[7/8] climate git commit: Resolve CLIMATE-607. Merge PR #178.
Posted by jo...@apache.org.
Resolve CLIMATE-607. Merge PR #178.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/823960e7
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/823960e7
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/823960e7
Branch: refs/heads/master
Commit: 823960e764c03247489a2ebcfd9bad1524d65e1d
Parents: a8be594 4c6d836
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Mar 19 07:13:02 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Mar 19 07:13:02 2015 -0700
----------------------------------------------------------------------
ocw-config-runner/tests/test_config_parsing.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/823960e7/ocw-config-runner/tests/test_config_parsing.py
----------------------------------------------------------------------
[5/8] climate git commit: Resolve CLIMATE-605. Merge PR #176.
Posted by jo...@apache.org.
Resolve CLIMATE-605. Merge PR #176.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/31eed443
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/31eed443
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/31eed443
Branch: refs/heads/master
Commit: 31eed443f7622a0383a17cf47971584acb8c80bf
Parents: dca99e0 db52b75
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Mar 19 07:07:45 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Mar 19 07:07:45 2015 -0700
----------------------------------------------------------------------
ocw/plotter.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/8] climate git commit: CLIMATE-608 - Add mailmap file to repo
Posted by jo...@apache.org.
CLIMATE-608 - Add mailmap file to repo
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/f68150c1
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/f68150c1
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/f68150c1
Branch: refs/heads/master
Commit: f68150c146b4a128ba95e5a5751b67ec47907c06
Parents: dca99e0
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Mar 18 12:17:44 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Mar 18 12:17:44 2015 -0700
----------------------------------------------------------------------
.mailmap | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/f68150c1/.mailmap
----------------------------------------------------------------------
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..8c3fa0d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,28 @@
+Michael Joyce <jo...@apache.org> joyce <jo...@unknown>
+Michael Joyce <jo...@apache.org> mjjoyce <mj...@unknown>
+Michael Joyce <jo...@apache.org> <ml...@gmail.com>
+Cameron Eugene Goodale <go...@apache.org> cgoodale <cg...@apache.org>
+Cameron Eugene Goodale <go...@apache.org> cgoodale <cg...@unknown>
+Cameron Eugene Goodale <go...@apache.org> Cameron Eugene Goodale <cg...@apache.org>
+Cameron Eugene Goodale <go...@apache.org> Cameron Eugene Goodale <go...@apache.org>
+Cameron Eugene Goodale <go...@apache.org> cgoodale <si...@gmail.com>
+Cameron Eugene Goodale <go...@apache.org> Cameron Goodale <go...@apache.org>
+Shakeh Elisabeth Khudikyan <sk...@apache.org> skhudiky <sk...@unknown>
+Shakeh Elisabeth Khudikyan <sk...@apache.org> Shakeh <se...@gmail.com>
+Maziyar Boustani <bo...@apache.org> Maziyar Boustani <ma...@yahoo.com>
+Maziyar Boustani <bo...@apache.org> boustani <bo...@unknown>
+Lewis John McGibbney <le...@apache.org> Lewis John McGibbney <le...@jpl.nasa.gov>
+Kim Whitehall <wh...@apache.org> kwhitehall <k_...@yahoo.com>
+Kim Whitehall <wh...@apache.org> Kim Whitehall <k_...@yahoo.com>
+Kim Whitehall <wh...@apache.org> whitehall <wh...@unknown>
+Kim Whitehall <wh...@apache.org> Kim Whitehall <kw...@users.noreply.github.com>
+Kim Whitehall <wh...@apache.org> georgette <k_...@yahoo.com>
+Huikyo Lee <hu...@apache.org> huikyole <hu...@unknown>
+Ross Laidlaw <rl...@apache.org> rlaidlaw <rl...@gmail.com>
+Paul Michael Ramirez <pr...@apache.org> Paul Ramirez
+Alex Goodman <go...@apache.org> goodman <go...@unknown>
+Alex Goodman <go...@apache.org> bassdx <ag...@gmail.com>
+Luca Cinquini <lu...@apache.org> cinquini <ci...@unknown>
+Denis Nadeau <dn...@apache.org> Denis Nadeau <dn...@esgcmor.gsfc.nasa.gov>
+Denis Nadeau <dn...@apache.org> dnadeau <dn...@unknown>
+Denis Nadeau <dn...@apache.org> Nadeau <dn...@GSSLA40018857.nccs.nasa.gov>
[6/8] climate git commit: Resolve CLIMATE-606. Merge PR #177.
Posted by jo...@apache.org.
Resolve CLIMATE-606. Merge PR #177.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/a8be5941
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/a8be5941
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/a8be5941
Branch: refs/heads/master
Commit: a8be5941fdd8d2bfedc58897603629ed4ca4b2bb
Parents: 31eed44 66b08b6
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Mar 19 07:10:37 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Mar 19 07:10:37 2015 -0700
----------------------------------------------------------------------
ocw-config-runner/configuration_parsing.py | 2 +-
ocw-config-runner/example/simple_model_to_model_bias.yaml | 2 +-
ocw-config-runner/plot_generation.py | 2 +-
ocw-config-runner/tests/test_config_parsing.py | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/8] climate git commit: CLIMATE-607 - Fix breaking config parser
tests
Posted by jo...@apache.org.
CLIMATE-607 - Fix breaking config parser tests
- A previous change split the various config parsing components out into
separate modules. The config parser import name was changed in the
test_config_parsing tests module but the actual call to the new import
was not.
- One of the logger mocks incorrectly referenced the old module name.
This was causing the mocking library to not recognize that the correct
logging function was in fact being called.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/4c6d8366
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/4c6d8366
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/4c6d8366
Branch: refs/heads/master
Commit: 4c6d8366577a9940d73667c4bd2d235aaefbd748
Parents: dca99e0
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Mar 18 11:34:09 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Mar 18 11:34:09 2015 -0700
----------------------------------------------------------------------
ocw-config-runner/tests/test_config_parsing.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/4c6d8366/ocw-config-runner/tests/test_config_parsing.py
----------------------------------------------------------------------
diff --git a/ocw-config-runner/tests/test_config_parsing.py b/ocw-config-runner/tests/test_config_parsing.py
index 36ef9be..01062e1 100644
--- a/ocw-config-runner/tests/test_config_parsing.py
+++ b/ocw-config-runner/tests/test_config_parsing.py
@@ -500,12 +500,12 @@ class TestRCMEDDatasetConfig(unittest.TestCase):
self.invalid_rcmed = conf[1]
def test_valid_rcmed_config(self):
- ret = config_runner._valid_dataset_config_data(self.valid_rcmed)
+ ret = parser._valid_dataset_config_data(self.valid_rcmed)
self.assertTrue(ret)
- @patch('ocw_evaluation_from_config.logger')
+ @patch('configuration_parsing.logger')
def test_invalid_rcmed_config(self, mock_logger):
- config_runner._valid_dataset_config_data(self.invalid_rcmed)
+ parser._valid_dataset_config_data(self.invalid_rcmed)
present_keys = set(self.invalid_rcmed.keys())
missing_keys = self.required_rcmed_keys - present_keys
[8/8] climate git commit: Resolve CLIMATE-608. Merge PR #179.
Posted by jo...@apache.org.
Resolve CLIMATE-608. Merge PR #179.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/6725431f
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/6725431f
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/6725431f
Branch: refs/heads/master
Commit: 6725431fbbdcd4f35bb7316f5f456a4414301503
Parents: 823960e f68150c
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Mar 19 07:15:01 2015 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Mar 19 07:15:01 2015 -0700
----------------------------------------------------------------------
.mailmap | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------