Ready for v1.0.1.

Author: zshaheen

.travis.yml

@@ -10,4 +10,4 @@ install:
   - python setup.py install
 
 script:
-  - python cdp/test/test_cdp_parameter.py
+  - bash cdp/test/test.sh

cdp/cdp_parser.py

@@ -10,28 +10,28 @@ def __init__(self, parameter_cls, *args, **kwargs):
         super(CDPParser, self).__init__(conflict_handler='resolve',
                                         *args, **kwargs)
         self.load_default_args()
-        self.parameter = parameter_cls()
-        self.args_namespace = None∂
+        self._parameter = parameter_cls()
+        self._args_namespace = None
 
     def get_parameter(self):
         """ Returns the parameter created by
         the command line inputs """
 
-        if self.args_namespace is None:
-            self.args_namespace = self.parse_args()
-        print self.args_namespace
+        if self._args_namespace is None:
+            self._args_namespace = self.parse_args()
 
-        if self.args_namespace.parameter is not None:
-            self.parameter.load_parameter_from_py(self.args_namespace.parameter)
+        if self._args_namespace.parameter is not None:
+            self._parameter.load_parameter_from_py(
+                self._args_namespace.parameter)
 
         # Overwrite the values of the parameter with the user's args
-        for arg_name, arg_value in vars(self.args_namespace).iteritems():
+        for arg_name, arg_value in vars(self._args_namespace).iteritems():
             if arg_value is not None:
                 # Add it to the parameter
-                setattr(self.parameter, arg_name, arg_value)
+                setattr(self._parameter, arg_name, arg_value)
 
-        self.parameter.check_values()
-        return self.parameter
+        self._parameter.check_values()
+        return self._parameter
 
     def load_default_args(self):
         """ Load the default arguments for
@@ -46,4 +46,4 @@ def load_default_args(self):
     def add_args_and_values(self, arg_list):
         """ Used for testing. Can test args input as if they
         were inputted from the command line. """
-        self.args_namespace = self.parse_args(arg_list)
+        self._args_namespace = self.parse_args(arg_list)

cdp/test/test.sh

@@ -0,0 +1 @@
+python -m unittest discover $(dirname $0)/

cdp/test/test_cdp_parameter.py

@@ -4,16 +4,17 @@
 
 
 class TestCDPParameter(unittest.TestCase):
+    class MyCDPParameter(cdp.cdp_parameter.CDPParameter):
+        def check_values(self):
+            pass
+
     def write_file(self, file_name, contents):
         f = open(file_name, 'w')
         f.write(contents)
         f.close()
 
     def setUp(self):
-        class MyCDPParameter(cdp.cdp_parameter.CDPParameter):
-            def check_values(self):
-                pass
-        self.cdp_parameter = MyCDPParameter()
+        self.cdp_parameter = self.MyCDPParameter()
 
     def test_load_working_parameter(self):
         self.write_file('CDPParameterFile.py', 'var0 = "var0"\n')

cdp/test/test_cdp_parser.py

@@ -0,0 +1,57 @@
+import unittest
+import os
+import cdp.cdp_parameter
+import cdp.cdp_parser
+
+
+class TestCDPParser(unittest.TestCase):
+
+    class MyCDPParameter(cdp.cdp_parameter.CDPParameter):
+        def check_values(self):
+            pass
+
+    class MyCDPParser(cdp.cdp_parser.CDPParser):
+        def __init__(self, *args, **kwargs):
+            super(TestCDPParser.MyCDPParser, self).__init__(
+                TestCDPParser.MyCDPParameter, *args, **kwargs)
+
+        def load_default_args(self):
+            super(TestCDPParser.MyCDPParser, self).load_default_args()
+            self.add_argument(
+                '-v', '--vars',
+                type=str,
+                nargs='+',
+                dest='vars',
+                help='Variables to use',
+                required=False)
+
+    def write_file(self, file_name, contents):
+        f = open(file_name, 'w')
+        f.write(contents)
+        f.close()
+
+    def setUp(self):
+        self.cdp_parser = self.MyCDPParser()
+
+    def test_load_default_args(self):
+        self.write_file('param_file.py', 'vars=["v1", "v2"]\n')
+        try:
+            self.cdp_parser.add_args_and_values(['-p', 'param_file.py'])
+            self.cdp_parser.get_parameter()
+        except:
+            self.fail('Failed to load a parameter with -p.')
+        os.remove('param_file.py')
+
+    def test_load_custom_args(self):
+        try:
+            self.cdp_parser.add_args_and_values(['-v', 'v1', 'v2'])
+        except:
+            self.fail('Failed to load variables with -v.')
+
+    def test_get_parameter(self):
+        self.cdp_parser.add_args_and_values(['-v', 'v1', 'v2'])
+        para = self.cdp_parser.get_parameter()
+        self.assertTrue(para.vars, ['v1', 'v2'])
+
+if __name__ == '__main__':
+    unittest.main()

conda/meta.yaml

@@ -4,10 +4,10 @@ about:
 
 package:
   name: cdp
-  version: '1.0.0'
+  version: '1.0.1'
 
 source:
-  git_rev: v1.0.0
+  git_rev: v1.0.1
   git_url: https://github.com/UV-CDAT/CDP.git
 
 requirements:

docs/source/conf.py

@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.0.0'
+version = u'1.0.1'
 # The full version, including alpha/beta/rc tags.
-release = u'1.0.0'
+release = u'1.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -135,7 +135,7 @@
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = u'cdp v1.0.0'
+# html_title = u'cdp v1.0.1'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #
@@ -147,8 +147,8 @@
 # html_logo = None
 
 # The name of an image file (relative to this directory) to use as a favicon of
-# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or
+# 32x32 pixels large.
 #
 # html_favicon = None
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="cdp",
-    version="1.0.0",
+    version="1.0.1",
     author="Zeshawn Shaheen",
     author_email="[email protected]",
     description="Framework for creating climate diagnostics.",