From 5c3cf83030aba5dd1831a6b37c630e3aec390571 Mon Sep 17 00:00:00 2001 From: Thomas Kittelmann Date: Thu, 25 Jul 2024 10:01:50 +0200 Subject: [PATCH] Temporarily avoid geant4 11.2 due to faulty conda pkg --- .github/resources/conda-setup.yml | 2 +- .github/resources/publish-doc-condaenv.yml | 20 -------------------- resources/conda_dgcode.yml | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 .github/resources/publish-doc-condaenv.yml diff --git a/.github/resources/conda-setup.yml b/.github/resources/conda-setup.yml index e405636..9ae4ca0 100644 --- a/.github/resources/conda-setup.yml +++ b/.github/resources/conda-setup.yml @@ -15,7 +15,7 @@ dependencies: - mcpl - matplotlib - zlib - - geant4>=11.1.3 + - geant4>=11.1.3,<11.2.0 - expat - openscenegraph - scipy diff --git a/.github/resources/publish-doc-condaenv.yml b/.github/resources/publish-doc-condaenv.yml deleted file mode 100644 index fad6de9..0000000 --- a/.github/resources/publish-doc-condaenv.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: publish-doc-condaenv -channels: - - conda-forge - - nodefaults -dependencies: - - python>=3.11 - - simple-build-system>=1.1.0 - - compilers - - bash - - zlib - - sphinx>=7.2.6 - - sphinx_rtd_theme>=1.3.0 - - sphinx-argparse -# - sphinx-toolbox - - pip - - pip: -# - git+https://github.com/sphinx-toolbox/sphinx-licenseinfo -# - sphinx-argparse - - sphinx-toolbox -# - sphinx-licenseinfo diff --git a/resources/conda_dgcode.yml b/resources/conda_dgcode.yml index f378e90..df60c48 100644 --- a/resources/conda_dgcode.yml +++ b/resources/conda_dgcode.yml @@ -10,7 +10,7 @@ dependencies: - mcpl - matplotlib - zlib - - geant4 >= 11.1.3 + - geant4>=11.1.3,<11.2.0 - expat - openscenegraph - scipy