update, add to installer

INSTALL

@@ -12,12 +12,34 @@
 
 INSTALL:
 
-This installer for the esgf publisher is intended to run on an existing esgf data node. The meta_synchro.py script has the additional dependency of the pysolr library.  
+This installer for the esgf publisher is intended to run on an existing esgf data node.
 
-1) source /etc/esg.env  - needed to run commands using the correct version of python for esgf.
+Additional prerequisites:
 
-2) as root: 
+ *  The meta_synchro.py script has the additional dependency of the pysolr library.  
+ *  The handler module for CMIP6 requires CMOR, its dependencies, and CF checker.
+
+1) as root: 
+
+    source /etc/esg.env  - needed to run commands using the correct version of python for esgf.
+
+2) (CMOR)
+  (a)  Download uuid hosted here: http://aims1.llnl.gov/nm-cfg/uuid-1.6.2.tar.gz
+
+      ./configure --prefix=/usr/local/uvcdat/2.2.0/Externals
+      make
+      make install
+
+  (b) git clone https://github.com/PCMDI/cmor.git
+      git checkout cmor-3.1.2
+     ./configure --prefix=/usr/local/cmor --with-uuid=/usr/local/uvcdat/2.2.0/Externals --with-netcdf=/usr/local/uvcdat/2.2.0/Externals --with-udunits2=/usr/local/uvcdat/2.2.0/Externals
+
+3) 
   cd src/python/esgcet
   ./setup.py install
 
-3) [optional]: easy_install pysolr 
+4) [optional]: easy_install pysolr 
+
+5) (CMOR) when running the publisher:
+
+    export UDUNITS2_XML_PATH=/usr/local/uvcdat/2.2.0/Externals/share/udunits/udunits2.xml

README

@@ -17,7 +17,16 @@ Detailed instructions on publishing are on the ESGF confluence site.  This is ac
 
 https://acme-climate.atlassian.net/wiki/display/ESGF/Guide+to+ESGF+Publishing+and+Best+Practices
 
-03 August 2016 - version 3.0,1
+29 August 2016 - version 3.1.0
+
+* Changes to support CMIP6
+  - Configuration option to extract global attributes
+  - Check for CMOR version in datafiles
+  - CF checker integration
+  - CMIP6-CV check integration (requires CMOR install)
+* Included documentation (requires sphinx, sphinx_rtd_theme)
+
+03 August 2016 - version 3.0.1
 
 * Setup.py inclusion of esgprep utility - see http://esgf-prepare.readthedocs.io/ for more information
 * Use of project-specific esg.ini files read from the default location

src/python/esgcet/setup.py

@@ -63,8 +63,8 @@ def check_version(ex, vers, minvers):
     author = 'PCMDI Software Team',
     author_email = 'webmaster@pcmdi.llnl.gov',
     url = 'http://esg-pcmdi.llnl.gov',
-    install_requires = ["psycopg2>=2.0", "SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99", "lxml>=2.0", "sqlalchemy_migrate>=0.6", "requests>=1.2.0", "esgprep>=2.4.6"],
-    setup_requires = ["psycopg2>=2.0", "SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99", "lxml>=2.0", "sqlalchemy_migrate>=0.6", "requests>=1.2.0", "esgprep>=2.4.6"],
+    install_requires = ["psycopg2>=2.0", "SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99", "lxml>=2.0", "sqlalchemy_migrate>=0.6", "requests>=1.2.0", "esgprep>=2.4.6", "cfchecker>=2.0.9"],
+    setup_requires = ["psycopg2>=2.0", "SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99", "lxml>=2.0", "sqlalchemy_migrate>=0.6", "requests>=1.2.0", "esgprep>=2.4.6", "cfchecker>=2.0.9"],
     packages = find_packages(exclude=['ez_setup']),
     include_package_data = True,
     # test_suite = 'nose.collector',
@@ -110,5 +110,5 @@ def check_version(ex, vers, minvers):
       """,
 )
 
-os.system("cp scripts/add_checksums_to_map.sh /usr/local/bin")
+