diff --git a/configure b/configure index 2599fbbc..23f4aa02 100755 --- a/configure +++ b/configure @@ -292,6 +292,9 @@ EOF # Special commands for Travis CI chmod +x "${QP_ROOT}"/external/opam_installer.sh rm --force ${QP_ROOT}/bin/opam + if [[ -n ${NO_CACHE} ]] ; then + rm -rf ${HOME}/.opam + fi export OPAMROOT=${HOME}/.opam cat << EOF | bash ${QP_ROOT}/external/opam_installer.sh --no-backup ${QP_ROOT}/bin @@ -301,9 +304,9 @@ ${QP_ROOT}/bin EOF rm ${QP_ROOT}/external/opam_installer.sh - source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true - - opam switch create ocaml-base-compiler.4.07.1 +# source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true +# +# opam switch create ocaml-base-compiler.4.07.1 opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing eval $(opam env) @@ -312,18 +315,19 @@ EOF else # Conventional commands execute << EOF - chmod +x "\${QP_ROOT}"/external/opam_installer.sh - "\${QP_ROOT}"/external/opam_installer.sh --no-backup + chmod +x "${QP_ROOT}"/external/opam_installer.sh + "${QP_ROOT}"/external/opam_installer.sh --no-backup EOF execute << EOF - rm --force \${QP_ROOT}/bin/opam - export OPAMROOT=\${OPAMROOT:-\${QP_ROOT}/external/opam} - echo \${QP_ROOT}/bin \ - | sh \${QP_ROOT}/external/opam_installer.sh + rm --force ${QP_ROOT}/bin/opam + export OPAMROOT=${OPAMROOT:-${QP_ROOT}/external/opam} + echo ${QP_ROOT}/bin \ + | sh ${QP_ROOT}/external/opam_installer.sh EOF rm ${QP_ROOT}/external/opam_installer.sh - source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true - opam switch create ocaml-base-compiler.4.07.1 || exit 1 +# source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true +# opam switch create ocaml-base-compiler.4.07.1 || exit 1 + opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing eval $(opam env) EOF diff --git a/docs/source/research.bib b/docs/source/research.bib index e6c75b9e..f0c0648c 100644 --- a/docs/source/research.bib +++ b/docs/source/research.bib @@ -1,6 +1,6 @@ %%% ARXIV TO BE UPDATED %%% @article{Giner2019Jul, - author = {Giner, Emmanuel and Scemama, Anthony and Toulouse, Julien and Loos, Pierre-Fran{\ifmmode\mbox{\c{c}}\else\c{c}\fi}ois}, + author = {Giner, Emmanuel and Scemama, Anthony and Toulouse, Julien and Loos, Pierre-Fran{\c{c}}ois}, title = {{Chemically Accurate Excitation Energies With Small Basis Sets}}, journal = {arXiv}, year = {2019},