Merge branch 'master' into stable

deployhq/build-cvmfs-tar-deploy.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+TAG=$1
+PID_FILE=$HOME/.cvmfs-lock
+
+# lock this process - this is needed as only one process
+# should do a cvmfs transaction at any given time
+if [ -e $PID_FILE ]; then
+    PID=$(cat $PID_FILE)
+    while kill -0 $PID >/dev/null 2>&1; do
+        sleep 30s
+    done
+fi
+echo $$ >$PID_FILE
+
+cvmfs_server transaction xenon.opensciencegrid.org
+
+cd /cvmfs/xenon.opensciencegrid.org/releases/nT/ 
+rm -rf $TAG 
+tar xzf /tmp/$TAG.tar.gz 
+cd /tmp
+
+cvmfs_server publish xenon.opensciencegrid.org
+
+# release lock
+rm $PID_FILE
+
+

deployhq/build-cvmfs-tar.sh

@@ -26,6 +26,6 @@ docker run -v `pwd`:/srv -i -t --rm \
        xenonnt/base-environment:$TAG \
        /bin/bash -c "/srv/build-cvmfs-tar-inside-helper.sh $TAG"
 
-scp generated/$TAG.tar.gz xenon@osg-cvmfs.grid.uchicago.edu:/tmp/
-ssh xenon@osg-cvmfs.grid.uchicago.edu "cvmfs_server transaction xenon.opensciencegrid.org && cd /cvmfs/xenon.opensciencegrid.org/releases/nT/ && rm -rf $TAG && tar xzf /tmp/$TAG.tar.gz && cd /tmp && pwd && cvmfs_server publish xenon.opensciencegrid.org"
+scp generated/$TAG.tar.gz deployhq/build-cvmfs-tar-deploy.sh xenon@osg-cvmfs.grid.uchicago.edu:/tmp/
+ssh xenon@osg-cvmfs.grid.uchicago.edu "/tmp/build-cvmfs-tar-deploy.sh $TAG"
 

requirements.txt

@@ -54,7 +54,7 @@ scipy==1.7.3
 seaborn==0.11.2
 statsmodels==0.13.1
 strax==1.1.5
-straxen==1.2.4
+straxen==1.2.6
 snakeviz==2.1.1
 sphinx==4.3.2
 tables==3.7.0     # pytables, necessary for pandas hdf5 i/o
@@ -64,7 +64,7 @@ torch==1.10.1
 typing_extensions==3.10.0  # Tensorflow and bokeh dependency
 tqdm==4.62.3
 utilix==0.6.6      # dependency for straxen, admix
-wfsim==0.5.12
+wfsim==0.5.13
 git+https://github.com/ershockley/admix@v1.0.6
 xarray==0.20.2
 zstd==1.5.0.4     # Strax dependency