enhancements to conda scripts

doc/RELEASE_NOTES.txt

+Release 2.2.2 (02/11/2019)
+=============================
+- Updated deployment scripts
+- Fixed several Python 2/3 compatibility issues
+
 Release 2.2.1 (02/04/2019)
 =============================
 - Updated API documentation

doc/sphinx/source/conf.py

@@ -57,9 +57,9 @@ author = u'APS/SDM'
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.1'
+version = '2.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.1'
+release = '2.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

tools/conda/aps-dm-api/meta.yaml

 package:
   name: aps-dm-api
-  version: 2.2.0
+  version: 2.2.1
 
 source:
   path: ../../..

tools/conda/aps-dm/build.sh

 #!/bin/sh
 
 # Builds aps-dm for conda
+CONDA_OPT_DM_DIR=$PREFIX/opt/dm
+RSYNC_CMD="rsync -arvlP --exclude '*.svn' --exclude '*.pyc' --exclude '__pycache__'"
 
 cd tools/pip/aps-dm
 make 
 pip install dist/*.whl
+cd ../../..
+
+echo "Using rsync command: $RSYNC_CMD"
+
+echo "Copying python sources to $CONDA_OPT_DM_DIR/src"
+mkdir -p $CONDA_OPT_DM_DIR/src
+eval "$RSYNC_CMD src/python $CONDA_OPT_DM_DIR/src/"
+
+#echo "Copying sbin scripts to $CONDA_OPT_DM_DIR/sbin"
+#mkdir -p $CONDA_OPT_DM_DIR/sbin
+#eval "$RSYNC_CMD sbin/*.sh $CONDA_OPT_DM_DIR/sbin"
+
+echo "Copying sql files to $CONDA_OPT_DM_DIR/db"
+mkdir -p $CONDA_OPT_DM_DIR/db
+eval "$RSYNC_CMD db/*.sql db/clean $CONDA_OPT_DM_DIR/db"
+
+echo "Copying html docs to $CONDA_OPT_DM_DIR/doc"
+mkdir -p $CONDA_OPT_DM_DIR/doc
+eval "$RSYNC_CMD doc/sphinx/build/html $CONDA_OPT_DM_DIR/doc"
+eval "$RSYNC_CMD doc/RELEASE_NOTES.txt $CONDA_OPT_DM_DIR/doc"
+
+#echo "Copying various template files to $CONDA_OPT_DM_DIR/etc"
+#mkdir -p $CONDA_OPT_DM_DIR
+#eval "$RSYNC_CMD etc setup.* $CONDA_OPT_DM_DIR"
+
 

tools/conda/aps-dm/meta.yaml

 package:
   name: aps-dm
-  version: 2.2.0
+  version: 2.2.2
 
 source:
   path: ../../..
@@ -29,6 +29,7 @@ requirements:
     - decorator
     - h5py
     - numpy>1.15
+    - postgresql=9.6.6
     - psycopg2
     - pvapy
     - pymongo

tools/conda/aps-dm/meta.yaml.template

@@ -29,6 +29,7 @@ requirements:
     - decorator
     - h5py
     - numpy>1.15
+    - postgresql=9.6.6
     - psycopg2
     - pvapy
     - pymongo