diff --git a/README.md b/README.md index 071a13505e698909e96b9d10298aa819c9a5307d..be1cdb760759680871f307d425f2e11f716b6165 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ cd eic_container modeuefile will be installed to `$PREFIX/../../etc/modulefiles`. You can use the `-v` flag to select the version you want to deploy, or omit the flag if you want to install the master build. The recommended stable - release version is `v2.2.2`. + release version is `v2.3.0`. ```bash -./deploy.py -v 2.2.2 <PREFIX> +./deploy.py -v 2.3.0 <PREFIX> ``` Available flags: @@ -116,8 +116,8 @@ Included software: - hepmc3@3.2.2 +python +rootio - podio@master - geant4@10.6.2 - - dd4hep@1.13.1 - - acts@1.00.0 + - dd4hep@1.14.1 + - acts@1.02.0 - gaudi@34.0 - dawn@3.91a - dawncut@1.54a diff --git a/VERSION b/VERSION index b1b25a5ffae43c2f07d222b53240d871e7c1789b..276cbf9e2858c779297bb9f73b34170302949ec4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.2 +2.3.0 diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile index b225b4353180402301c88f91ba25fff036104701..e80801e4eadd3192d67b6cab9f53a45ea08c17a5 100644 --- a/containers/builder/Dockerfile +++ b/containers/builder/Dockerfile @@ -1,6 +1,6 @@ # Builder with Argonne EIC software # -FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-20200922 +FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-20201025 LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ name="eic_builder" \ @@ -11,7 +11,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ ENV DOCKERFILE_BASE=debian \ DOCKERFILE_DISTRO=debian \ - DOCKERFILE_DISTRO_VERSION=20200908-testing \ + DOCKERFILE_DISTRO_VERSION=20201012-testing \ SPACK_ROOT=/opt/spack \ DEBIAN_FRONTEND=noninteractive \ CURRENTLY_BUILDING_DOCKER_IMAGE=1 \ diff --git a/containers/builder/spack.yaml b/containers/builder/spack.yaml index afcd7cf54e90d4ab97f97af26d77a5192a7b48ca..af27cfc779f657cf49caf76fb5aa42af545aa76d 100644 --- a/containers/builder/spack.yaml +++ b/containers/builder/spack.yaml @@ -1,30 +1,29 @@ spack: specs: - - cmake@3.18.1 - - fmt@6.1.2 cxxstd=17 - - spdlog@1.5.0 - - nlohmann-json - - heppdt@3.04.01 - - clhep@2.4.1.3 cxxstd=17 - - cairo+fc+ft+X+pdf+gobject - - eigen@3.3.7 - - python@3.7.8 - - py-pip - - py-numpy - - py-pyyaml - - xrootd@4.12.3 cxxstd=17 +python - - root@6.22.00 cxxstd=17 +fftw +fortran +gdml +http +mlp +pythia8 +root7 +tmva +vc +xrootd +ssl ^mesa+opengl -llvm -osmesa - - pythia8@8244 - - hepmc3@3.2.2 +python +rootio - - stow@2.2.2 - - podio@master - - geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl - - dd4hep@1.13.1 +geant4 +assimp +hepmc3 - - acts@1.00.0 +dd4hep +digitization +identification +json +tgeo - - gaudi@34.0 - - dawn@3_91a - - dawncut@1_54a + - cmake@3.18.1 + - fmt@6.1.2 cxxstd=17 + - spdlog@1.5.0 + - nlohmann-json + - heppdt@3.04.01 + - clhep@2.4.1.3 cxxstd=17 + - cairo+fc+ft+X+pdf+gobject + - eigen@3.3.7 + - python@3.7.8 + - py-pip + - py-numpy + - py-pyyaml + - xrootd@4.12.3 cxxstd=17 +python + - root@6.22.00 cxxstd=17 +fftw +fortran +gdml +http +mlp +pythia8 +root7 +tmva +vc + +xrootd +ssl ^mesa+opengl -llvm -osmesa + - pythia8@8244 + - hepmc3@3.2.2 +python +rootio + - stow@2.2.2 + - podio@master + - geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl + - dd4hep@1.14.1 +geant4 +assimp +hepmc3 + - acts@1.02.0 +dd4hep +digitization +identification +json +tgeo + - gaudi@34.0 + - dawn@3_91a + - dawncut@1_54a concretization: together - config: - install_tree: /opt/software view: /usr/local diff --git a/containers/release/Dockerfile.in b/containers/release/Dockerfile.in index 7d49e32783f04f98a2f7fd2ffa076c23f18c986c..3696ffc4bddce643b40ceea4c2f761256d04f9e8 100644 --- a/containers/release/Dockerfile.in +++ b/containers/release/Dockerfile.in @@ -11,7 +11,7 @@ RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \ grep 'x-executable\|x-archive\|x-sharedlib' | \ awk -F: '{print $1}' | xargs strip -s -FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-20200908 +FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-20201012 LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ name="eic" \ group="eic" \ @@ -22,7 +22,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ ## @ENV@ will be automatically expanded to auto-load the ## runtime environment ENV DOCKERFILE_DISTRO=ubuntu \ - DOCKERFILE_DISTRO_VERSION=20200908-testing \ + DOCKERFILE_DISTRO_VERSION=20201012-testing \ DEBIAN_FRONTEND=noninteractive \ @ENV@ @@ -35,7 +35,6 @@ RUN apt-get -yqq update \ ghostscript \ gv \ poppler-utils \ - && apt-get -yqq purge lmod \ && apt-get -yqq autoremove \ && rm -rf /var/lib/apt/lists/* diff --git a/deploy.py b/deploy.py index ad7b283bf002b68ee2ff86d8650d0e6c6269f238..e0d3cbdae8aae05caa5ef1db2331a3d17f3976f3 100755 --- a/deploy.py +++ b/deploy.py @@ -93,7 +93,7 @@ if __name__ == "__main__": ## for everything installed, but ensure we have the leading v as well where needed version = '{}'.format(args.version) vversion = '{}'.format(args.version) - if version[0] is 'v': + if version[0] == 'v': version = version[1:] if vversion[0].isdigit(): vversion= 'v{}'.format(args.version)