From 3931d682a6c7665554dcbc94d82c5f9d35a5d770 Mon Sep 17 00:00:00 2001 From: fynnbe Date: Fri, 22 Mar 2024 10:58:43 +0100 Subject: [PATCH] keras needs py >=3.9 --- .github/workflows/build.yaml | 9 +++++++++ README.md | 2 +- dev/env-py38.yaml | 36 ++++++++++++++++++++++++++++++++++++ dev/env-wo-python.yaml | 4 ++-- dev/env.yaml | 4 ++-- dev/environment-tf.yaml | 4 ++-- 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 dev/env-py38.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c06980da..77bf04c7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,6 +30,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Conda environment with Micromamba + if: matrix.python-version != '3.8' uses: mamba-org/setup-micromamba@v1 with: cache-downloads: true @@ -38,6 +39,14 @@ jobs: create-args: >- python=${{ matrix.python-version }} post-cleanup: 'all' + - name: Install py3.8 environment + if: matrix.python-version == '3.8' + uses: mamba-org/setup-micromamba@v1 + with: + cache-downloads: true + cache-environment: true + environment-file: dev/env-py38.yaml + post-cleanup: 'all' - name: additional setup run: pip install --no-deps -e . - name: pytest-spec-conda diff --git a/README.md b/README.md index 51ac8c37..dd76c085 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ pip install bioimageio.core[onnx,pytorch] ### Set up Development Environment -To set up a development mamba environment run the following commands: +To set up a development conda environment run the following commands: ```console mamba env create -f dev/env.yaml diff --git a/dev/env-py38.yaml b/dev/env-py38.yaml new file mode 100644 index 00000000..4c9cefd8 --- /dev/null +++ b/dev/env-py38.yaml @@ -0,0 +1,36 @@ +# manipulated copy of env.yaml +name: core38 +channels: + - conda-forge + - defaults +dependencies: + - bioimageio.spec>=0.5.1 + - black + - crick + - filelock + - imageio>=2.5 + # - keras>=3.0 # removed + - loguru + - numpy + - onnxruntime + - packaging>=17.0 + - pip + - pre-commit + - psutil + - pydantic + - pydantic-settings + - pyright + - pytest + - pytest-xdist + - python-dotenv + - python=3.8 # changed + - pytorch>=2.1 + - ruff + - ruyaml + - torchvision + - tqdm + - typer + - typing-extensions + - xarray + - pip: + - --no-deps -e .. diff --git a/dev/env-wo-python.yaml b/dev/env-wo-python.yaml index 4fc66314..8ddce65b 100644 --- a/dev/env-wo-python.yaml +++ b/dev/env-wo-python.yaml @@ -23,8 +23,8 @@ dependencies: - pytest - pytest-xdist - python-dotenv - # - python=3.8 # removed - - pytorch>=1.6 + # - python=3.9 # removed + - pytorch>=2.1 - ruff - ruyaml - torchvision diff --git a/dev/env.yaml b/dev/env.yaml index 02423c46..580cf7be 100644 --- a/dev/env.yaml +++ b/dev/env.yaml @@ -22,8 +22,8 @@ dependencies: - pytest - pytest-xdist - python-dotenv - - python=3.8 - - pytorch>=1.6 + - python=3.9 + - pytorch>=2.1 - ruff - ruyaml - torchvision diff --git a/dev/environment-tf.yaml b/dev/environment-tf.yaml index 1de415f8..566b7ca2 100644 --- a/dev/environment-tf.yaml +++ b/dev/environment-tf.yaml @@ -23,8 +23,8 @@ dependencies: - pytest - pytest-xdist - python-dotenv - - python=3.8 - # - pytorch>=1.6 # removed + - python=3.9 + # - pytorch>=2.1 # removed - ruff - ruyaml - tensorflow>=2.16 # added