From b67c87c6c5629f0b945500e4d195aa954af65834 Mon Sep 17 00:00:00 2001 From: Joran Angevaare Date: Thu, 9 Dec 2021 10:43:12 +0100 Subject: [PATCH 1/6] Update requirements.txt --- requirements.txt | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4081b558..833465cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ astropy==4.3.1 blosc==1.10.6 # Strax dependency -bokeh==2.3.3 +bokeh==2.4.2 boltons==21.0.0 codenamize==1.2.3 # for human-readable hashing commentjson==0.9.0 # Straxen dependency -coveralls==3.2.0 +coveralls==3.3.1 cython==0.29.24 dask==2021.10.0 dask-jobqueue==0.7.3 @@ -16,14 +16,14 @@ flamedisx==1.5.0 future==0.18.2 GitPython==3.1.24 # Pegasus dependency holoviews==1.14.6 -hypothesis==6.24.1 +hypothesis==6.29.0 iminuit==2.8.4 ipympl==0.8.2 # For online monitoring jedi==0.17.2 # upgrading to 0.18.0 breaks autocomplete in ipython jupyter==1.0.0 jupyter-resource-usage==0.6.0 # Memory viewer for notebooks jupyterlab==3.2.1 -keras==2.6.0 +keras==2.7.0 line_profiler==3.3.1 llvmlite==0.37.0 # numba depencency lz4==3.1.3 # Strax dependency @@ -36,12 +36,13 @@ nestpy==1.4.8 # WFsim dependency npshmex==0.2.1 # Strax dependency numba==0.54.1 # Strax dependency numpy==1.19.5 -packaging==20.8 +packaging==21.3 pandas==1.3.2 pandoc==1.1.0 -panel==0.12.1 +panel==0.12.5 parso==0.7.1 # upgrading to 0.8.0 breaks autocomplete in ipython pdmongo==0.1.0 # Strax dependency +pema==0.3.3 pika==1.2.0 # Pegasus psutil==5.8.0 # Strax dependency pyarrow==6.0.0 # Necessary for pandas feather i/o @@ -52,15 +53,15 @@ scikit-learn==1.0.1 scipy==1.7.1 seaborn==0.11.2 statsmodels==0.13.0 -strax==1.1.2 -straxen==1.1.3 +strax==1.1.3 +straxen==1.1.4 snakeviz==2.1.1 sphinx==4.2.0 tables==3.6.1 # pytables, necessary for pandas hdf5 i/o -tensorflow==2.6.1 # TF2.4.1 should not bring in additional AVX2 requirements (https://github.com/XENONnT/base_environment/issues/433) +tensorflow==2.7.0 tensorflow_probability==0.14.1 -torch==1.10.0 # Strax dependency -typing_extensions==3.7.4.3 # Tensorflow and bokeh dependency +torch==1.10.0 +typing_extensions==3.10.0 # Tensorflow and bokeh dependency tqdm==4.62.3 utilix==0.6.5 # dependency for straxen, admix wfsim==0.5.11 From d624765df934f1ca033ae5c6274305ad558d4b34 Mon Sep 17 00:00:00 2001 From: Joran Angevaare Date: Tue, 21 Dec 2021 16:59:18 +0100 Subject: [PATCH 2/6] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6bcf48e4..8649fc84 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,7 +53,7 @@ scikit-learn==1.0.1 scipy==1.7.3 seaborn==0.11.2 statsmodels==0.13.1 -strax==1.1.3 +strax==1.1.4 straxen==1.2.0 snakeviz==2.1.1 sphinx==4.3.1 From 63900689b4de37ac8ad4717784b2d268f7212dce Mon Sep 17 00:00:00 2001 From: Joran Angevaare Date: Tue, 21 Dec 2021 17:19:21 +0100 Subject: [PATCH 3/6] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8649fc84..9ee15418 100644 --- a/requirements.txt +++ b/requirements.txt @@ -46,7 +46,7 @@ pema==0.3.5 pika==1.2.0 # Pegasus psutil==5.8.0 # Strax dependency pyarrow==6.0.1 # Necessary for pandas feather i/o -pymongo==3.12.1 +pymongo==3.12.0 pytest==6.2.5 pytest-runner==5.3.1 scikit-learn==1.0.1 From 3b525bbf077b87212d315bc7133013363786a89a Mon Sep 17 00:00:00 2001 From: Evan Shockley Date: Wed, 22 Dec 2021 10:41:15 -0800 Subject: [PATCH 4/6] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f59a81ad..9c2802c4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5637096.svg)](https://doi.org/10.5281/zenodo.5637096) [![Test and update contexts](https://github.com/XENONnT/base_environment/actions/workflows/test_and_update.yml/badge.svg)](https://github.com/XENONnT/base_environment/actions/workflows/test_and_update.yml) -Base software environment for XENONnT, including Python 3.6 and data management tools. +Base software environment for XENONnT, including Python 3.8 and data management tools. Please see [this page on the XENON wiki](https://xe1t-wiki.lngs.infn.it/doku.php?id=xenon%3Axenonnt%3Acomputing%3Abaseenvironment) for more details. @@ -20,6 +20,9 @@ The resulting environment is available as: use the environment for example on your laptop. The location is `opensciencegrid/osgvo-xenon:{version}` * **Singularity images available on https**. This version is experimental. The location is `https://xenon.isi.edu/images/` + +## master and stable branches +Currently, the master branch is used for the "development" container, which always points to the master branch of cutax (note this only matters on hardcoded sites: Midway and the OSG login node for now). The stable branch has a tagged version of cutax. ## Deployment @@ -35,3 +38,4 @@ taking place twice: once to build the Docker container with a deployment under + From 39775bd8eee072b17984534a96b7b2df201bb633 Mon Sep 17 00:00:00 2001 From: Joran Angevaare Date: Mon, 27 Dec 2021 20:10:18 +0100 Subject: [PATCH 5/6] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9ee15418..bab4b5c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -54,7 +54,7 @@ scipy==1.7.3 seaborn==0.11.2 statsmodels==0.13.1 strax==1.1.4 -straxen==1.2.0 +straxen==1.2.1 snakeviz==2.1.1 sphinx==4.3.1 tables==3.6.1 # pytables, necessary for pandas hdf5 i/o From 19fa69fb3822884268792caf1cdb22201ed3ef57 Mon Sep 17 00:00:00 2001 From: Evan Shockley Date: Tue, 28 Dec 2021 10:14:19 -0800 Subject: [PATCH 6/6] Add mplconfig directory --- create-env | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/create-env b/create-env index 21bceff5..28e2b0ba 100755 --- a/create-env +++ b/create-env @@ -254,6 +254,12 @@ if [ \$INSTALL_CUTAX -eq 1 ]; then fi fi +# set env variable for matplotlib styles on Midway +MPL_DIR='/dali/lgrandi/xenonnt/software/nton/mplconfigs/' +if [ -e \$MPL_DIR ]; then + export MPLCONFIGDIR=\$MPL_DIR +fi + EOF announce "Adding zzz-50-xenon.sh"