climate git commit: CLIMATE-859 Enable restructured text markdown for Pypi uploads

2016-08-19 Thread lewismc 
Repository: climate
Updated Branches:
  refs/heads/master 653bec552 -> 818784ede


CLIMATE-859 Enable restructured text markdown for Pypi uploads


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/818784ed
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/818784ed
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/818784ed

Branch: refs/heads/master
Commit: 818784edebcbaedd4786a27b08b1f3af5498c140
Parents: 653bec5
Author: Lewis John McGibbney 
Authored: Fri Aug 19 13:43:43 2016 -0700
Committer: Lewis John McGibbney 
Committed: Fri Aug 19 13:43:43 2016 -0700

--
 README.md |  2 ++
 setup.py  | 36 +++-
 2 files changed, 21 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/818784ed/README.md
--
diff --git a/README.md b/README.md
index 832b261..a8530d3 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 [![Requirements 
Status](https://requires.io/github/apache/climate/requirements.svg?branch=master)](https://requires.io/github/apache/climate/requirements/?branch=master)
 [![Code 
Health](https://landscape.io/github/apache/climate/master/landscape.svg?style=flat-square)](https://landscape.io/github/apache/climate/master)
 
+![](https://svn.apache.org/repos/asf/climate/site/trunk/content/images/ocw-logo-variant-sm-01-01-new.png)
+
 Apache Open Climate Workbench is an effort to develop software that performs 
climate model evaluations using model outputs from a variety of different 
sources (the Earth System Grid Federation, the Coordinated Regional Downscaling 
Experiment, the U.S. National Climate Assessment and the North American 
Regional Climate Change Assessment Program) and temporal/spatial scales with 
remote sensing data from NASA, NOAA and other agencies. The toolkit includes 
capabilities for rebinning, metrics computation and visualization. For 
additional project information, please check the [project 
website](http://climate.apache.org/).
 
 ## Getting Started

http://git-wip-us.apache.org/repos/asf/climate/blob/818784ed/setup.py
--
diff --git a/setup.py b/setup.py
index 20d746b..0cda41f 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ from setuptools import find_packages, setup
 # Package data
 # 
 _author   = 'Apache Open Climate Workbench'
-_authorEmail  = 'd...@climate.apache.org'
+_author_email  = 'd...@climate.apache.org'
 _classifiers  = [
 'Environment :: Console',
 'Intended Audience :: Developers',
@@ -37,30 +37,32 @@ _classifiers  = [
 'Topic :: Software Development :: Libraries :: Python Modules',
 ]
 _description  = 'Apache Open Climate Workbench'
-_downloadURL  = 'http://pypi.python.org/pypi/ocw/'
+_download_url  = 'http://pypi.python.org/pypi/ocw/'
 _requirements = []
 _keywords = ['climate analysis', 'workbench', 'rebinning', 'metrics', 
'computation', 'visualization']
 _license  = 'Apache License, Version 2.0'
 _long_description= 'The Apache Open Climate Workbench provides tools for 
the evaluation and analysis of climate models.'
 _name = 'ocw'
 _namespaces   = []
-_testSuite= 'ocw.tests'
+_test_suite= 'ocw.tests'
 _url  = 'http://climate.apache.org/'
 _version  = '1.2.0'
-_zipSafe  = False
+_zip_safe  = False
 
 # Setup Metadata
 # --
 
-def _read(*rnames):
-return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+try:
+import pypandoc
+_long_description = pypandoc.convert(
+source='README.md',
+format='markdown_github',
+to='rst',
+outputfile='README.rst')
+except(IOError, ImportError):
+_long_description = open('README.md').read()
 
-_header = '*' * len(_name) + '\n' + _name + '\n' + '*' * len(_name)
-_longDescription = '\n\n'.join([
-_header,
-_read('README.md')
-])
-open('doc.txt', 'w').write(_longDescription)
+open('doc.txt', 'w').write(_long_description)
 
 # Include shapefiles
 _pathout = os.path.join('ocw', 'shape')
@@ -70,21 +72,21 @@ _package_data = {'ocw': _shapefiles}
 
 setup(
 author=_author,
-author_email=_authorEmail,
+author_email=_author_email,
 classifiers=_classifiers,
 description=_description,
-download_url=_downloadURL,
+download_url=_download_url,
 include_package_data=True,
 install_requires=_requirements,
 keywords=_keywords,
 license=_license,
-long_description=_longDescription,
+long_description=_long_description,
 name=_name,
 namespace_packages=_namespaces,
 packages=find_packages(),
-test_suite=_testSuite,
+test_suite=_test_suite,

climate git commit: CLIMATE-859 Enable restructured text markdown for Pypi uploads

2016-08-19 Thread lewismc 
Repository: climate
Updated Branches:
  refs/heads/CLIMATE-859 653bec552 -> 818784ede


CLIMATE-859 Enable restructured text markdown for Pypi uploads


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/818784ed
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/818784ed
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/818784ed

Branch: refs/heads/CLIMATE-859
Commit: 818784edebcbaedd4786a27b08b1f3af5498c140
Parents: 653bec5
Author: Lewis John McGibbney 
Authored: Fri Aug 19 13:43:43 2016 -0700
Committer: Lewis John McGibbney 
Committed: Fri Aug 19 13:43:43 2016 -0700

--
 README.md |  2 ++
 setup.py  | 36 +++-
 2 files changed, 21 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/818784ed/README.md
--
diff --git a/README.md b/README.md
index 832b261..a8530d3 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 [![Requirements 
Status](https://requires.io/github/apache/climate/requirements.svg?branch=master)](https://requires.io/github/apache/climate/requirements/?branch=master)
 [![Code 
Health](https://landscape.io/github/apache/climate/master/landscape.svg?style=flat-square)](https://landscape.io/github/apache/climate/master)
 
+![](https://svn.apache.org/repos/asf/climate/site/trunk/content/images/ocw-logo-variant-sm-01-01-new.png)
+
 Apache Open Climate Workbench is an effort to develop software that performs 
climate model evaluations using model outputs from a variety of different 
sources (the Earth System Grid Federation, the Coordinated Regional Downscaling 
Experiment, the U.S. National Climate Assessment and the North American 
Regional Climate Change Assessment Program) and temporal/spatial scales with 
remote sensing data from NASA, NOAA and other agencies. The toolkit includes 
capabilities for rebinning, metrics computation and visualization. For 
additional project information, please check the [project 
website](http://climate.apache.org/).
 
 ## Getting Started

http://git-wip-us.apache.org/repos/asf/climate/blob/818784ed/setup.py
--
diff --git a/setup.py b/setup.py
index 20d746b..0cda41f 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ from setuptools import find_packages, setup
 # Package data
 # 
 _author   = 'Apache Open Climate Workbench'
-_authorEmail  = 'd...@climate.apache.org'
+_author_email  = 'd...@climate.apache.org'
 _classifiers  = [
 'Environment :: Console',
 'Intended Audience :: Developers',
@@ -37,30 +37,32 @@ _classifiers  = [
 'Topic :: Software Development :: Libraries :: Python Modules',
 ]
 _description  = 'Apache Open Climate Workbench'
-_downloadURL  = 'http://pypi.python.org/pypi/ocw/'
+_download_url  = 'http://pypi.python.org/pypi/ocw/'
 _requirements = []
 _keywords = ['climate analysis', 'workbench', 'rebinning', 'metrics', 
'computation', 'visualization']
 _license  = 'Apache License, Version 2.0'
 _long_description= 'The Apache Open Climate Workbench provides tools for 
the evaluation and analysis of climate models.'
 _name = 'ocw'
 _namespaces   = []
-_testSuite= 'ocw.tests'
+_test_suite= 'ocw.tests'
 _url  = 'http://climate.apache.org/'
 _version  = '1.2.0'
-_zipSafe  = False
+_zip_safe  = False
 
 # Setup Metadata
 # --
 
-def _read(*rnames):
-return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+try:
+import pypandoc
+_long_description = pypandoc.convert(
+source='README.md',
+format='markdown_github',
+to='rst',
+outputfile='README.rst')
+except(IOError, ImportError):
+_long_description = open('README.md').read()
 
-_header = '*' * len(_name) + '\n' + _name + '\n' + '*' * len(_name)
-_longDescription = '\n\n'.join([
-_header,
-_read('README.md')
-])
-open('doc.txt', 'w').write(_longDescription)
+open('doc.txt', 'w').write(_long_description)
 
 # Include shapefiles
 _pathout = os.path.join('ocw', 'shape')
@@ -70,21 +72,21 @@ _package_data = {'ocw': _shapefiles}
 
 setup(
 author=_author,
-author_email=_authorEmail,
+author_email=_author_email,
 classifiers=_classifiers,
 description=_description,
-download_url=_downloadURL,
+download_url=_download_url,
 include_package_data=True,
 install_requires=_requirements,
 keywords=_keywords,
 license=_license,
-long_description=_longDescription,
+long_description=_long_description,
 name=_name,
 namespace_packages=_namespaces,
 packages=find_packages(),
-test_suite=_testSuite,
+

[2/2] climate git commit: Merge branch 'CLIMATE-858' of https://github.com/jarifibrahim/climate

2016-08-19 Thread lewismc 
Merge branch 'CLIMATE-858' of https://github.com/jarifibrahim/climate


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/653bec55
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/653bec55
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/653bec55

Branch: refs/heads/master
Commit: 653bec552b3bdd5eeb15fcbabaa94353d595678a
Parents: 7e53612 6e4ae04
Author: Lewis John McGibbney 
Authored: Fri Aug 19 12:05:56 2016 -0700
Committer: Lewis John McGibbney 
Committed: Fri Aug 19 12:05:56 2016 -0700

--
 .travis.yml | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--

[1/2] climate git commit: CLIMATE-858 - Fix Travis Build

2016-08-19 Thread lewismc 
Repository: climate
Updated Branches:
  refs/heads/master 7e53612bd -> 653bec552


CLIMATE-858 - Fix Travis Build


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/6e4ae047
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/6e4ae047
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/6e4ae047

Branch: refs/heads/master
Commit: 6e4ae04771eb43f2a4aa86b569897734c56b6ac4
Parents: 28964ae
Author: Ibrahim Jarif 
Authored: Fri Aug 19 18:57:28 2016 +0530
Committer: Ibrahim Jarif 
Committed: Fri Aug 19 18:57:28 2016 +0530

--
 .travis.yml | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/6e4ae047/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 360dd7b..209ad29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,16 @@ language: python
 python:
   - "2.7"
 notifications:
-   email: false
+  email: false
 install:
   - sudo apt-get update
   - source easy-ocw/install-ubuntu.sh
   - pip install python-coveralls
+# Workaround to get travis build working with matplotlib
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
 script:
   - chmod a+x test.sh
   - ./test.sh

[2/2] climate git commit: Merge branch 'CLIMATE-853'

2016-08-19 Thread omkarr 
Merge branch 'CLIMATE-853'


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/7e53612b
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7e53612b
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7e53612b

Branch: refs/heads/master
Commit: 7e53612bd78a86b2ac3ce88d5e82b41c66e13b5d
Parents: 28964ae 83c19de
Author: Omkar20895 
Authored: Fri Aug 19 20:16:16 2016 +0530
Committer: Omkar20895 
Committed: Fri Aug 19 20:16:16 2016 +0530

--
 ocw/data_source/dap.py | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)
--

[1/2] climate git commit: CLIMATE-853 Fixing broken documentation in dap.py and making it PEP8 compliant

2016-08-19 Thread omkarr 
Repository: climate
Updated Branches:
  refs/heads/master 28964ae74 -> 7e53612bd


CLIMATE-853 Fixing broken documentation in dap.py and making it PEP8 compliant


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/83c19de7
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/83c19de7
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/83c19de7

Branch: refs/heads/master
Commit: 83c19de75b0976e0b06a0a6c8b171ea4bb901ce9
Parents: 817c854
Author: Omkar20895 
Authored: Wed Aug 17 22:50:22 2016 +0530
Committer: Omkar20895 
Committed: Wed Aug 17 22:50:22 2016 +0530

--
 ocw/data_source/dap.py | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/83c19de7/ocw/data_source/dap.py
--
diff --git a/ocw/data_source/dap.py b/ocw/data_source/dap.py
index fc9d2a3..663bc36 100644
--- a/ocw/data_source/dap.py
+++ b/ocw/data_source/dap.py
@@ -47,18 +47,21 @@ def load(url, variable, name=''):
 # but conventions aren't always followed and all dimensions aren't always 
present so
 # see if we can make some educated deductions before defaulting to just 
pulling the first three
 # columns.
-temp_dimensions = map(lambda x:x.lower(),dataset.dimensions)
+temp_dimensions = map(lambda x: x.lower(), dataset.dimensions)
 
 dataset_dimensions = dataset.dimensions
-time = dataset_dimensions[temp_dimensions.index('time') if 'time' in 
temp_dimensions else 0]
-lat = dataset_dimensions[temp_dimensions.index('lat') if 'lat' in 
temp_dimensions else 1]
-lon = dataset_dimensions[temp_dimensions.index('lon') if 'lon' in 
temp_dimensions else 2]
+time = dataset_dimensions[temp_dimensions.index(
+'time') if 'time' in temp_dimensions else 0]
+lat = dataset_dimensions[temp_dimensions.index(
+'lat') if 'lat' in temp_dimensions else 1]
+lon = dataset_dimensions[temp_dimensions.index(
+'lon') if 'lon' in temp_dimensions else 2]
 
 # Time is given to us in some units since an epoch. We need to convert
 # these values to datetime objects. Note that we use the main object's
 # time object and not the dataset specific reference to it. We need to
 # grab the 'units' from it and it fails on the dataset specific object.
-times = np.array(_convert_times_to_datetime(d[time]))
+times = np.array(convert_times_to_datetime(d[time]))
 
 lats = np.array(dataset[lat][:])
 lons = np.array(dataset[lon][:])
@@ -73,7 +76,7 @@ def load(url, variable, name=''):
name=name, origin=origin)
 
 
-def _convert_times_to_datetime(time):
+def convert_times_to_datetime(time):
 '''Convert the OpenDAP time object's values to datetime objects
 
 The time values are stored as some unit since an epoch. These need to be