You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by le...@apache.org on 2018/01/17 03:06:21 UTC
[1/3] climate git commit: CLIMATE-945 Grunt Errors On Build Task
Repository: climate
Updated Branches:
refs/heads/master d4d2eab5d -> 3be7da888
CLIMATE-945 Grunt Errors On Build Task
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/2dd6b516
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/2dd6b516
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/2dd6b516
Branch: refs/heads/master
Commit: 2dd6b5163fb5e27bfae62561ccb34429a535f8d4
Parents: 4cf79f3
Author: Michael Anderson <mi...@Michaels-iMac.local>
Authored: Sun Jan 7 07:22:03 2018 -0500
Committer: Michael Anderson <mi...@Michaels-iMac.local>
Committed: Sun Jan 7 07:22:03 2018 -0500
----------------------------------------------------------------------
ocw-ui/frontend/.jscsrc | 17 +++++++++++++++++
ocw-ui/frontend/Gruntfile.js | 9 +++++++++
ocw-ui/frontend/app/views/modelselect.html | 2 +-
ocw-ui/frontend/package.json | 6 ++++--
4 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/.jscsrc
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/.jscsrc b/ocw-ui/frontend/.jscsrc
new file mode 100644
index 0000000..cb61269
--- /dev/null
+++ b/ocw-ui/frontend/.jscsrc
@@ -0,0 +1,17 @@
+{
+ "disallowTrailingWhitespace": true,
+ "disallowUnusedParams": true,
+ "disallowUnusedVariables": true,
+ "requireCapitalizedComments": true,
+ "requireCurlyBraces": true,
+ "requireDotNotation": true,
+ "requireLineFeedAtFileEnd": true,
+ "requireSemicolons": true,
+ "requireSpaceAfterComma": true,
+ "requireSpaceAfterLineComment": true,
+ "requireSpaceBetweenArguments": true,
+ "requireSpacesInConditionalExpression": true,
+ "requireTemplateStrings": true,
+ "requireYodaConditions": true,
+ "validateQuoteMarks": "'"
+}
http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/Gruntfile.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/Gruntfile.js b/ocw-ui/frontend/Gruntfile.js
index a58f762..43757c8 100644
--- a/ocw-ui/frontend/Gruntfile.js
+++ b/ocw-ui/frontend/Gruntfile.js
@@ -132,6 +132,14 @@ module.exports = function (grunt) {
}
},
+ // Supplements jshint with a focus on style.
+ jscs: {
+ src: '<%= yeoman.app %>/scripts/{,*/}*.js',
+ options: {
+ config: ".jscsrc",
+ fix: false
+ }
+ },
// Empties folders to start fresh
clean: {
dist: {
@@ -408,6 +416,7 @@ module.exports = function (grunt) {
grunt.registerTask('default', [
'newer:jshint',
+ 'jscs',
'test',
'build'
]);
http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/app/views/modelselect.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/views/modelselect.html b/ocw-ui/frontend/app/views/modelselect.html
index 9bc128f..6c6f8ba 100644
--- a/ocw-ui/frontend/app/views/modelselect.html
+++ b/ocw-ui/frontend/app/views/modelselect.html
@@ -54,7 +54,7 @@ under the License.
</div>
<div class="control-group">
<label class="control-label" for="lonSelect">Longitude Variable</label>
- <div class"controls">
+ <div class="controls">
<select id="lonSelect">
<option ng-repeat="lon in lonVariables">
{{lon.text}}
http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/package.json
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/package.json b/ocw-ui/frontend/package.json
index 8024f17..553e4b1 100644
--- a/ocw-ui/frontend/package.json
+++ b/ocw-ui/frontend/package.json
@@ -2,8 +2,8 @@
"name": "ocwui",
"version": "1.2.0",
"description": "A tool for the evaluation and analysis of climate models.",
- "repository": {
- "type" : "git",
+ "repository": {
+ "type" : "git",
"url" : "https://git-wip-us.apache.org/repos/asf/climate.git"
},
"license": "Apache-2.0",
@@ -14,6 +14,7 @@
"generator-angular": "^0.9.5",
"generator-karma": "^0.8.3",
"grunt": "^0.4.1",
+ "grunt-jscs": "^3.0.1",
"grunt-autoprefixer": "^0.7.3",
"grunt-cli": "^0.1.13",
"grunt-concurrent": "^0.5.0",
@@ -31,6 +32,7 @@
"grunt-google-cdn": "^0.4.0",
"grunt-karma": "^0.8.3",
"grunt-newer": "^0.7.0",
+ "grunt-ngmin": "^0.0.3",
"grunt-ng-annotate": "^0.1.0",
"grunt-svgmin": "^0.4.0",
"grunt-usemin": "^2.1.1",
[3/3] climate git commit: Merge branch 'CLIMATE-945' of
https://github.com/MichaelArthurAnderson/climate
Posted by le...@apache.org.
Merge branch 'CLIMATE-945' of https://github.com/MichaelArthurAnderson/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/3be7da88
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/3be7da88
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/3be7da88
Branch: refs/heads/master
Commit: 3be7da888f75b0a426e5108787b86cd9bc6f2bb0
Parents: d4d2eab ac52e38
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Tue Jan 16 19:06:17 2018 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Tue Jan 16 19:06:17 2018 -0800
----------------------------------------------------------------------
ocw-ui/frontend/.jscsrc | 17 +++++++++++++++++
ocw-ui/frontend/Gruntfile.js | 9 +++++++++
ocw-ui/frontend/app/views/modelselect.html | 2 +-
ocw-ui/frontend/package.json | 2 ++
4 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/3be7da88/ocw-ui/frontend/package.json
----------------------------------------------------------------------
diff --cc ocw-ui/frontend/package.json
index d158a20,99cafcb..844c76e
--- a/ocw-ui/frontend/package.json
+++ b/ocw-ui/frontend/package.json
@@@ -30,8 -30,9 +31,9 @@@
"grunt-contrib-watch": "^0.6.1",
"grunt-filerev": "^0.2.1",
"grunt-google-cdn": "^0.4.0",
- "grunt-karma": "^0.8.3",
+ "grunt-karma": "^0.12.2",
"grunt-newer": "^0.7.0",
+ "grunt-ngmin": "^0.0.3",
"grunt-ng-annotate": "^0.1.0",
"grunt-svgmin": "^0.4.0",
"grunt-usemin": "^2.1.1",
[2/3] climate git commit: Merge branch 'master' into CLIMATE-945
Posted by le...@apache.org.
Merge branch 'master' into CLIMATE-945
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/ac52e388
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/ac52e388
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/ac52e388
Branch: refs/heads/master
Commit: ac52e3887cdb74383585bba54bcc46efee0517fc
Parents: 2dd6b51 1373563
Author: MichaelArthurAnderson <mi...@gmail.com>
Authored: Tue Jan 16 21:39:32 2018 -0500
Committer: GitHub <no...@github.com>
Committed: Tue Jan 16 21:39:32 2018 -0500
----------------------------------------------------------------------
docs/source/conf.py | 9 +
docs/source/index.rst | 1 +
docs/source/ocw/statistical_downscaling.rst | 8 +
examples/GPM_WRF24_JPDF_comparison.py | 26 +++
examples/draw_climatology_map_MISR_AOD.py | 26 +++
examples/esgf_integration_example.py | 15 ++
examples/knmi_to_cru31_full_bias.py | 32 ++++
examples/model_ensemble_to_rcmed.py | 32 ++++
examples/multi_model_evaluation.py | 36 ++++
examples/multi_model_taylor_diagram.py | 51 ++++++
examples/podaac_integration_example.py | 21 +++
examples/simple_model_to_model_bias.py | 29 ++++
examples/simple_model_tstd.py | 24 +++
examples/subregions_portrait_diagram.py | 144 +++++++++++-----
examples/subregions_rectangular_boundaries.py | 73 +++++---
examples/subset_TRMM_data_for_NCA_regions.py | 25 ++-
examples/taylor_diagram_example.py | 31 ++++
examples/temperature_trends_over_CONUS.py | 71 +++++---
examples/time_series_with_regions.py | 172 ++++++++++++-------
ocw-ui/backend/processing.py | 12 +-
ocw-ui/backend/rcmed_helpers.py | 71 ++++----
ocw-ui/backend/run_webservices.py | 37 +++-
.../app/scripts/controllers/parameterselect.js | 28 ++-
.../app/scripts/controllers/rcmedselection.js | 4 +-
.../directives/predictivefilebrowserinput.js | 25 ++-
.../app/scripts/services/evaluationsettings.js | 2 +-
ocw-ui/frontend/package.json | 20 ++-
ocw-ui/frontend/test/karma.conf.js | 43 ++++-
.../test/spec/controllers/rcmedselection.js | 8 +-
ocw/dataset.py | 3 +-
ocw/dataset_loader.py | 17 +-
ocw/dataset_processor.py | 10 +-
ocw/plotter.py | 81 +++++++--
ocw/statistical_downscaling.py | 51 ++++--
ocw/utils.py | 16 +-
35 files changed, 965 insertions(+), 289 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/ac52e388/ocw-ui/frontend/package.json
----------------------------------------------------------------------