Merge latest updates from integration

docker/ejsonschema/Dockerfile

@@ -1,16 +1,10 @@
 FROM oar-metadata/jq
 
-RUN apt-get update && apt-get install -y unzip uwsgi uwsgi-src \
-                                         uuid-dev libcap-dev libpcre3-dev python3-distutils
-RUN PYTHON=python3 uwsgi --build-plugin "/usr/src/uwsgi/plugins/python python3" && \
-    mv python3_plugin.so /usr/lib/uwsgi/plugins/python3_plugin.so && \
-    chmod 644 /usr/lib/uwsgi/plugins/python3_plugin.so
+RUN apt-get update && apt-get install -y unzip uuid-dev libcap-dev \
+                                         libpcre3-dev python3-distutils
 
-RUN update-alternatives --install /usr/lib/uwsgi/plugins/python_plugin.so \
-    python_plugin.so /usr/lib/uwsgi/plugins/python3_plugin.so 1
-
-RUN python -m pip install "setuptools<66.0.0"
-RUN python -m pip install json-spec jsonschema==2.4.0 requests \
+RUN python -m pip install "setuptools<66.0.0" 
+RUN python -m pip install lxml uwsgi json-spec jsonschema==2.4.0 requests \
                           pytest==4.6.5 filelock crossrefapi pyyaml jsonpath_ng
 RUN python -m pip install --no-dependencies jsonmerge==1.3.0 
 

requirements.txt

@@ -0,0 +1,17 @@
+setuptools<66.0.0
+json-spec
+jsonschema==2.4.0
+requests
+pytest==4.6.5
+filelock
+crossrefapi
+pymongo
+jsonmerge==1.3.0
+funcsigs
+bagit>=1.6.3,<2.0
+fs>=2.0.21
+jsonpatch
+jsonpath_ng
+ejsonschema @ https://github.com/usnistgov/ejsonschema/archive/master.zip
+pynoid @ https://github.com/RayPlante/pynoid/archive/master.zip
+multibag @ https://github.com/usnistgov/multibag-py/archive/0.3.zip

scripts/_install-env.sh

@@ -12,6 +12,29 @@ true ${SOURCE_DIR:=$base}
 true ${INSTALL_DIR:=/usr/local}
 ##########
 
+function help {
+    echo ${prog} -- install software from this repository
+    cat <<EOF
+
+This script installs the authbroker software as a package into a given 
+or system location.  By default, this location is /usr/local/authbroker; 
+below this directory, directories like "bin" and "lib/python" will be 
+created and loaded up.
+
+Usage:  $prog [OPTION ...] 
+
+Options:
+   --install-dir DIR    Install the softwared below an arbitrary location 
+                        (other than the default, /usr/local/authbroker).
+   --prefix DIR         An alias for --intall-dir
+   --source-dir DIR     The directory containing the source code, overriding 
+                        the default being the directory containing the 
+                        scripts subdirectory where this script resides.
+   --dir DIR            An alieas for --source-dir
+
+EOF
+}
+
 # handle command line options
 while [ "$1" != "" ]; do 
   case "$1" in
@@ -29,6 +52,10 @@ while [ "$1" != "" ]; do
         shift
         SOURCE_DIR=$1
         ;;
+    -h|--help)
+        help
+        exit 0
+        ;;
     -*)
         echo "$prog: unsupported option:" $1
         false