Merge changes to release 3.3.2 (#326)

* update to 3.2.9 in cmor.h

* update tables to 01.00.17

* use CdUnif

* fix Table memory

* fix Table version 6.0 to 6.2

* Fix licences and conventions; Fix memory issue

* insure that cdms2 is not loaded

* update tables

* fix cronjob message for CMIP6_CV push

* update to version 3.3.0

* use 1024 character, fix regex

* Make sure buffer does not overflow due to license

* Add multiprocessing to PrePARE

* pep8 code

* create parallelization for PrePARE

* fix typo

* Fix basin integer missing value; add test; move code around in PrePARE.py

* update test tables

* fix conda recipe

* pinning anaconda-client to 1.6.5 due to network issue

* check in source section is defined in CV souce_id

* fix external variable issue

* add test for branch_time...

* fix climatology issue

* change geo_region to sector

* update upload scripts

* add then to script

* fix travis; branch_time.. message; license(OSX)

* use gcc_linux-64

* try miniconda 4.3.21

* change docker to centos 6.8

* change branch_time message

* Cleanup code and arguments. "cmip6_table" positional input has been removed to avoid conflicts with multiprocessing.

* Cleanup code and arguments. Rollback table path option to file or dir. Pass variable flag in process if submitted. Append prints to logfile instead of truncate it.

* Reformat code

* set .h to 3.3.2

* fix type, fix PrePARE branch_ metadata

* fix type, fix PrePARE branch_ metadata

* merge

* put back some lost code in merging

* Add "OR" support for cell_measures comparison + Add input filters

* Replace set_CV_error by self.cv_error

* Some PEP008 rewriting

* Bugfix on 'OR' support for cell_measures

* Proper "cell_methods" comparison without or without text in parentheses

* fix return code for parallel/sequentiel

* fix cell measures

* pep8 PrePARE

* Add safe return code

* add error code to check_cv; merge Guillaume's branch

* update tables to 01.00.23

* fix climatology issue for monotonic files

Lib/pywrapper.py

@@ -616,7 +616,7 @@ def zfactor(zaxis_id, zfactor_name, units="", axis_ids=None,
         type = 'd'
 
     if not isinstance(type, str):
-        raise Exception("error tpye must a a string")
+        raise Exception("error type must a string")
     type = type.lower()
     if type == 's':
         type = 'c'