diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d32a7266f8b3677ea380a707b497ed78dbf16c6f..5a977d8e4ae1bd946cc5b9038f686f0e204bcb01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,8 +251,11 @@ pages: stage: deploy image: docker:20.10.12 needs: ["containers"] - only: - - schedules + except: + refs: + - schedules + changes: + - containers/* script: - cd containers - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY diff --git a/containers/v3-dockerfile-test-suite-python310 b/containers/v3-dockerfile-test-suite-python310 index 0c5afe520980912afc1165e82d4942e807ce8618..71fd9f37757a8a6b34b68fd4b58e32e48fd9c4b2 100644 --- a/containers/v3-dockerfile-test-suite-python310 +++ b/containers/v3-dockerfile-test-suite-python310 @@ -32,7 +32,7 @@ RUN conda install -n ${conda_env} -c conda-forge scikit-image celerite george # Install dependencies and samplers RUN pip install corner healpy cython tables -RUN conda install -n ${conda_env} dynesty emcee nestle ptemcee pymultinest ultranest cpnest kombine dnest4 zeus-mcmc pytorch pymc nessai -c conda-forge -c pytorch +RUN conda install -n ${conda_env} dynesty emcee nestle ptemcee pymultinest ultranest cpnest kombine dnest4 zeus-mcmc pytorch pymc nessai ptmcmcsampler -c conda-forge -c pytorch # Install Polychord RUN apt-get update --allow-releaseinfo-change diff --git a/containers/v3-dockerfile-test-suite-python38 b/containers/v3-dockerfile-test-suite-python38 index f8301025caba434573db94478ef0e7c788676590..bde0d526d9bd99eab112b5aadab1c3e4cd02b699 100644 --- a/containers/v3-dockerfile-test-suite-python38 +++ b/containers/v3-dockerfile-test-suite-python38 @@ -32,7 +32,7 @@ RUN conda install -n ${conda_env} -c conda-forge scikit-image celerite george # Install dependencies and samplers RUN pip install corner healpy cython tables -RUN conda install -n ${conda_env} dynesty emcee nestle ptemcee pymultinest ultranest cpnest kombine dnest4 zeus-mcmc pytorch pymc nessai -c conda-forge -c pytorch +RUN conda install -n ${conda_env} dynesty emcee nestle ptemcee pymultinest ultranest cpnest kombine dnest4 zeus-mcmc pytorch pymc nessai ptmcmcsampler -c conda-forge -c pytorch # Install Polychord RUN apt-get update --allow-releaseinfo-change diff --git a/containers/v3-dockerfile-test-suite-python39 b/containers/v3-dockerfile-test-suite-python39 index d436cdfc63e53f4cef002ad60314bb8a8d60fdd1..5dbafefa38e8d96d0f821d2c74b81e1c6e88478d 100644 --- a/containers/v3-dockerfile-test-suite-python39 +++ b/containers/v3-dockerfile-test-suite-python39 @@ -32,7 +32,7 @@ RUN conda install -n ${conda_env} -c conda-forge scikit-image celerite george # Install dependencies and samplers RUN pip install corner healpy cython tables -RUN conda install -n ${conda_env} dynesty emcee nestle ptemcee pymultinest ultranest cpnest kombine dnest4 zeus-mcmc pytorch pymc nessai -c conda-forge -c pytorch +RUN conda install -n ${conda_env} dynesty emcee nestle ptemcee pymultinest ultranest cpnest kombine dnest4 zeus-mcmc pytorch pymc nessai ptmcmcsampler -c conda-forge -c pytorch # Install Polychord RUN apt-get update --allow-releaseinfo-change diff --git a/containers/write_dockerfiles.py b/containers/write_dockerfiles.py index 3dc242ac4a329d6d4c90cbda97a1a5ed860f4213..14bb63ebee9cd1b03d5850aa668e1dbd632850c7 100644 --- a/containers/write_dockerfiles.py +++ b/containers/write_dockerfiles.py @@ -10,17 +10,17 @@ conda_sampler_dict = dict( python38=[ "dynesty", "emcee", "nestle", "ptemcee", "pymultinest", "ultranest", "cpnest", "kombine", "dnest4", "zeus-mcmc", - "pytorch", "pymc", "nessai", + "pytorch", "pymc", "nessai", "ptmcmcsampler", ], python39=[ "dynesty", "emcee", "nestle", "ptemcee", "pymultinest", "ultranest", "cpnest", "kombine", "dnest4", "zeus-mcmc", - "pytorch", "pymc", "nessai", + "pytorch", "pymc", "nessai", "ptmcmcsampler", ], python310=[ "dynesty", "emcee", "nestle", "ptemcee", "pymultinest", "ultranest", "cpnest", "kombine", "dnest4", "zeus-mcmc", - "pytorch", "pymc", "nessai", + "pytorch", "pymc", "nessai", "ptmcmcsampler", ] )