unify version handling of the package

Author: Try2Code

python/cdo/__init__.py

@@ -1,4 +1,4 @@
 __author__ = "Brian Earl Spilner [email protected]"
-__version__ = "1.6"
+__version__ = "1.6.0"
 
 from .cdo import Cdo, CDOException

python/cdo/cdo.py

@@ -53,8 +53,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 # }}}
 
-CDO_PY_VERSION = "1.6"
-
 # build interactive documentation: help(cdo.sinfo) {{{
 
 def operator_doc(tool, path2cdo):
@@ -795,11 +793,6 @@ def readXDataset(self, ifile=None):
 
         return self.xa_open(ifile)
 
-    # internal helper methods:
-    # return internal cdo.py version
-    def __version__(self):
-        return CDO_PY_VERSION
-
     def __print__(self, context=''):
         if '' != context:
             print('CDO:CONTEXT ' + context)

python/test/test_cdo.py

@@ -23,7 +23,7 @@
 # add local dir to search path
 sys.path.insert(0,os.path.dirname(sys.path[0]))
 from cdo import Cdo, CDOException
-
+import cdo as cdoPkg
 
 if 'CDF_MOD' in os.environ:
   CDF_MOD = os.environ['CDF_MOD']
@@ -85,9 +85,9 @@ def test_ju(self):
         print(cdo.sinfov(input='-topo'))
 
     def testCDO(self):
+        self.assertTrue(parse_version(cdoPkg.__version__) >= parse_version('1.6.0'))
         cdo = Cdo()
         print('this is CDO version %s'%(cdo.version()))
-        print('cdo-bindings version: %s'%(cdo.__version__()))
         newCDO="/home/ram/src/tools/spack/opt/spack/linux-antergos-skylake/gcc-11.1.0/cdo-1.9.9-switof25xqmlys765t7aonnc564wl3jl/bin/cdo"
         if os.path.isfile(newCDO):
             cdo.setCdo(newCDO)