You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@climate.apache.org by lewismc <gi...@git.apache.org> on 2014/10/13 23:30:46 UTC
[GitHub] climate pull request: CLIMATE-523 Integrate mccsearch module into ...
GitHub user lewismc opened a pull request:
https://github.com/apache/climate/pull/113
CLIMATE-523 Integrate mccsearch module into master branch
This is a pull request for https://issues.apache.org/jira/browse/CLIMATE-523.
The code is in sync with master branch and can be merged.
I've just noticed that we *may* need to address license headers for all files.
There are some issues (0) which @kwhitehall has identified as being in need of some attention. We can and will move these over to the climate Jira instance.
My thinking here is that we merge this code into master, we then hash out the TODO's and iron out the minor things in line with the process of flushing out some of Kim's knowledge onto the website as documentation.
Great work on this Kim, it is very exciting to see your code making it in to Climate.
(0) https://github.com/kwhitehall/climate/issues
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/kwhitehall/climate mccsearch
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/climate/pull/113.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #113
----
commit 1201406334a5d9c548c416cd8c171d009fefd16b
Author: Cameron Eugene Goodale <go...@apache.org>
Date: 2013-06-26T17:32:17Z
Branching to roll Release Candidate v3 for 0.1-incubating
git-svn-id: https://svn.apache.org/repos/asf/incubator/climate/branches/0.1-incubating@1497016 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 14a02cbdd5ba0b29f7723432f2535beb29f30d73
commit d3cb950856c0d5311ceccbfe62559c8e4d0f3109
Author: Cameron Eugene Goodale <go...@apache.org>
Date: 2013-07-25T15:39:21Z
Branching to roll Release Candidate v5 for 0.1-incubating
git-svn-id: https://svn.apache.org/repos/asf/incubator/climate/branches/0.1-incubating@1507020 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 418ced716599893d4da7a6ccc3a3fe9691141743
commit 8158c151a1307cffb0ea55cede3360579010c46e
Author: Joe Schaefer <jo...@apache.org>
Date: 2014-03-03T04:18:24Z
Climate has become a TLP
git-svn-id: https://svn.apache.org/repos/asf/climate/branches/0.1-incubating@1573437 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 307dd5c264b81aa4016e355d6a1d60bd28e095b7
commit 5f3a85211af19cf34cdd653f46f8745938c432b1
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-04-07T22:14:54Z
initial mccsearch code
commit aed34f0b8135694d4cc3e97d8f5960b89343f1c2
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-04-13T12:55:11Z
Some linting and refactoring
1 Updated doc strings, removed print statements and updated
documentation
2 Refactored checkCriteriaB to be generic function checkCriteria
3 Also fixed findPrecipRate
commit 5e1a3d1c3adad1df0d0db78a9711b9d0480932b2
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-04-13T13:01:33Z
1 Updated doc strings, removed print statements and updated
documentation
2 Refactored checkCriteriaB to be generic function checkCriteria
3 Also fixed findPrecipRate
commit 0747070d51599a0071a22dea8d0b8020d6e44f72
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-04-13T13:05:15Z
Merge branch '0.1-incubating' of https://github.com/kwhitehall/climate into mccsearch
commit 0b6b8a279b98210f96ecdb88020e2c1d046b25c5
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-04-13T13:09:25Z
mccserach - some linting
commit 1d0b5a5b7e6769d12a4777f0a945400fff9a8883
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-04-14T00:59:22Z
remove unnecessary files
commit 63e7d5ad4d5ca9911f187293e1747f6b02b5e628
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-04-30T23:34:05Z
added a UI
commit f21e24d6636480792fb44eb3df3c34e12495efb8
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-05-15T19:04:28Z
mccSearchUI.py
commit a5b7677b528197daf1dee5cb05adeac35bc4846d
Author: kwhitehall <k_...@yahoo.com>
Date: 2014-05-15T19:23:27Z
Merge git://git.apache.org/climate into mccsearch
commit 0d1f3d0f891ece9492e3c355c19464c4ff24faaf
Author: georgette <k_...@yahoo.com>
Date: 2014-06-03T13:37:52Z
fixed bug regarding ability to access a subset of files in a folder
commit 21c1c04a2579f80a41d1b55022f2ee2ebee7df38
Author: georgette <k_...@yahoo.com>
Date: 2014-06-03T13:39:06Z
fixed bug regarding ability to access a subset of files in a folder
commit 73f82089e5345a6512cff3b243cff3aefdd92a73
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Date: 2014-08-25T17:56:57Z
Move docsgit status
commit 5070312cb1eac272c515b0df1bb46c597421ba61
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Date: 2014-08-25T17:57:52Z
Smarten up documentation for mccsearch branch and move it into a docs directory
commit abcc73c1e661edec5d0776f14b7001e81e4da3dc
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Date: 2014-08-25T18:00:14Z
Smarten up documentation for mccsearch branch.
commit 4d64d2142736aa7b1a3d1e83b8f56322c4dba128
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Date: 2014-08-25T23:45:06Z
Fix formatting, remove unused imports, update files.py and process.py to most recent OCW code
commit ebd2ef2efc4e70474423800a1db4973a0ed8a758
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Date: 2014-08-25T23:48:09Z
Remove reference to Nio, this has been updated to use netCDF4
commit 587b2033e71f2102c27441b45023a133f92a05e5
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Date: 2014-08-26T00:12:11Z
Remove unused imports from mainProg.py
commit 8fcd2a20eb12db233e81622f7c0771aad637f3e0
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Date: 2014-10-11T01:57:17Z
Merge branch 'master' into mccsearch
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE-523 Integrate mccsearch module into ...
Posted by lewismc <gi...@git.apache.org>.
Github user lewismc commented on the pull request:
https://github.com/apache/climate/pull/113#issuecomment-59287724
@MJJoyce, the bogus early commits are now removed after rebase.
For the time being I've retained the commit trail as I personally don't know what @kwhitehall wants to do with regards to squashing her commits. I am not bothered either way.
What I do not want to do is bugger up the rebasing effort. If you have an objection to us merging this branch with master *as is* then we can explore the squashing effort. I am not too fused and would quite like to see if merged as is is at all possible.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE-523 Integrate mccsearch module into ...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/climate/pull/113
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE-523 Integrate mccsearch module into ...
Posted by MJJoyce <gi...@git.apache.org>.
Github user MJJoyce commented on the pull request:
https://github.com/apache/climate/pull/113#issuecomment-59283776
Hey @lewismc. Super awesome getting this up. it looks like this PR might need cleaned up a bit perhaps. Maybe a rebase to get everything caught up judging from some of the extremely early commits here (like 1201406). Squashing some commits might help as well.
Awesome job on this!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE-523 Integrate mccsearch module into ...
Posted by MJJoyce <gi...@git.apache.org>.
Github user MJJoyce commented on the pull request:
https://github.com/apache/climate/pull/113#issuecomment-59390745
+1 @lewismc, I'm fine with the incremental progress commits on this one given the amount of effort you've put into just getting it to this point. Let's just get it in there sooner rather than later and be nitpicky on other stuff =)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE-523 Integrate mccsearch module into ...
Posted by OCWJenkins <gi...@git.apache.org>.
Github user OCWJenkins commented on the pull request:
https://github.com/apache/climate/pull/113#issuecomment-58958043
Can one of the admins verify this patch?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---