diff --git a/.github/workflows/docker-plugin.yml b/.github/workflows/docker-plugin.yml index 60e10e546..74a1b07d4 100644 --- a/.github/workflows/docker-plugin.yml +++ b/.github/workflows/docker-plugin.yml @@ -26,10 +26,10 @@ jobs: MONAI_ZOO_AUTH_TOKEN: ${{ github.token }} steps: - uses: actions/checkout@v7 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v7 with: - python-version: 3.10 + python-version: "3.11" - name: clean up run: | sudo rm -rf /usr/share/dotnet @@ -39,7 +39,8 @@ jobs: python -m pip install --upgrade pip wheel - name: Build run: | - rm -rf /opt/hostedtoolcache + # keep the interpreter installed by setup-python; drop the rest of the tool cache to free disk + find /opt/hostedtoolcache -mindepth 1 -maxdepth 1 ! -name Python -exec rm -rf {} + docker --version cd plugins/dsa docker system prune -f diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2de189cf5..b2c071f62 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,7 +33,8 @@ jobs: echo Before Cleanup... df -h sudo rm -rf "$AGENT_TOOLSDIRECTORY" - rm -rf /opt/hostedtoolcache + # keep the interpreter installed by setup-python; drop the rest of the tool cache to free disk + find /opt/hostedtoolcache -mindepth 1 -maxdepth 1 ! -name Python -exec rm -rf {} + rm -rf /usr/share/dotnet/ cd /opt find . -maxdepth 1 -mindepth 1 '!' -path ./containerd '!' -path ./actionarchivecache '!' -path ./runner '!' -path ./runner-cache -exec rm -rf '{}' ';' diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 90d47aea6..de75ab215 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.11", "3.12"] steps: - uses: actions/checkout@v7 - name: Set up Python @@ -42,7 +42,8 @@ jobs: - if: runner.os == 'Linux' name: Cleanup (Linux only) run: | - rm -rf /opt/hostedtoolcache + # keep the interpreter installed by setup-python; drop the rest of the tool cache to free disk + find /opt/hostedtoolcache -mindepth 1 -maxdepth 1 ! -name Python -exec rm -rf {} + - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel @@ -54,7 +55,7 @@ jobs: MONAI_ZOO_AUTH_TOKEN: ${{ github.token }} strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.11", "3.12"] steps: - uses: actions/checkout@v7 - name: Set up Python @@ -63,7 +64,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - rm -rf /opt/hostedtoolcache + # keep the interpreter installed by setup-python; drop the rest of the tool cache to free disk + find /opt/hostedtoolcache -mindepth 1 -maxdepth 1 ! -name Python -exec rm -rf {} + sudo apt-get install openslide-tools -y python -m pip install --upgrade pip wheel pip install -r requirements-dev.txt @@ -90,7 +92,7 @@ jobs: MONAI_ZOO_AUTH_TOKEN: ${{ github.token }} strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.11", "3.12"] steps: - uses: actions/checkout@v7 with: @@ -114,7 +116,8 @@ jobs: key: ${{ runner.os }}-pip-${{ steps.pip-cache.outputs.datew }} - name: Install dependencies run: | - rm -rf /opt/hostedtoolcache + # keep the interpreter installed by setup-python; drop the rest of the tool cache to free disk + find /opt/hostedtoolcache -mindepth 1 -maxdepth 1 ! -name Python -exec rm -rf {} + sudo apt-get install openslide-tools -y python -m pip install --user --upgrade pip setuptools wheel python -m pip install torch torchvision @@ -152,7 +155,7 @@ jobs: MONAI_ZOO_AUTH_TOKEN: ${{ github.token }} strategy: matrix: - python-version: ["3.10"] + python-version: ["3.11"] steps: - uses: actions/checkout@v7 - name: Set up Python @@ -173,7 +176,8 @@ jobs: key: ${{ runner.os }}-pip-${{ steps.pip-cache.outputs.datew }} - name: Install dependencies run: | - rm -rf /opt/hostedtoolcache + # keep the interpreter installed by setup-python; drop the rest of the tool cache to free disk + find /opt/hostedtoolcache -mindepth 1 -maxdepth 1 ! -name Python -exec rm -rf {} + sudo apt-get install openslide-tools -y python -m pip install --upgrade pip wheel python -m pip install -r docs/requirements.txt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d788ffe31..89da21d5f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,10 +35,10 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-node@v7 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v7 with: - python-version: 3.10 + python-version: "3.11" - name: Cache for pip uses: actions/cache@v6 id: cache @@ -49,7 +49,8 @@ jobs: key: ${{ runner.os }}-pip-${{ steps.pip-cache.outputs.datew }} - name: Install dependencies run: | - rm -rf /opt/hostedtoolcache + # keep the interpreter installed by setup-python; drop the rest of the tool cache to free disk + find /opt/hostedtoolcache -mindepth 1 -maxdepth 1 ! -name Python -exec rm -rf {} + sudo apt-get install openslide-tools -y python -m pip install --user --upgrade pip setuptools wheel python -m pip install torch torchvision diff --git a/.readthedocs.yml b/.readthedocs.yml index 76aef6d84..15d56852c 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -20,7 +20,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.10" + python: "3.11" # Build documentation in the docs/ directory with Sphinx sphinx: diff --git a/Dockerfile b/Dockerfile index cf02e489e..084a12a14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ #ARG FINAL_IMAGE=pytorch/pytorch:2.5.1-cuda12.4-cudnn9-runtime ARG FINAL_IMAGE=ubuntu:22.04 -ARG BUILD_IMAGE=python:3.10 +ARG BUILD_IMAGE=python:3.11 ARG NODE_IMAGE=node:slim # Phase1: Build OHIF Viewer diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 7990b1993..e6a3a7628 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -52,7 +52,7 @@ Prerequisites -------------------------- MONAI Label supports both **Ubuntu** and **Windows** OS with GPU/CUDA enabled. -Make sure you have python 3.10+ version environment with PyTorch and CUDA installed. MONAI Label features on other python version are not verified. +Make sure you have python 3.11+ version environment with PyTorch and CUDA installed. MONAI Label features on other python version are not verified. - Install `Python `_ - Install the following Python libraries diff --git a/plugins/ohif/monai-label/package.json b/plugins/ohif/monai-label/package.json index 5d9dd54dc..a2fa975f1 100644 --- a/plugins/ohif/monai-label/package.json +++ b/plugins/ohif/monai-label/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", - "axios": "^0.21.1", + "axios": "^0.33.0", "arraybuffer-concat": "^0.0.1", "ndarray": "^1.0.19", "md5.js": "^1.3.5", diff --git a/plugins/ohifv3/extensions/monai-label/package.json b/plugins/ohifv3/extensions/monai-label/package.json index 9472d5975..5d5e511cb 100644 --- a/plugins/ohifv3/extensions/monai-label/package.json +++ b/plugins/ohifv3/extensions/monai-label/package.json @@ -52,7 +52,7 @@ "@kitware/vtk.js": "32.12.0", "react-color": "^2.19.3", "md5.js": "^1.3.5", - "axios": "^0.21.1", + "axios": "^0.33.0", "arraybuffer-concat": "^0.0.1", "ndarray": "^1.0.19", "nrrd-js": "^0.2.1", diff --git a/plugins/ohifv3/modes/monai-label/package.json b/plugins/ohifv3/modes/monai-label/package.json index 0fed81295..e97eb8029 100644 --- a/plugins/ohifv3/modes/monai-label/package.json +++ b/plugins/ohifv3/modes/monai-label/package.json @@ -42,7 +42,7 @@ "i18next": "^17.0.3" }, "devDependencies": { - "@babel/core": "7.24.7", + "@babel/core": "7.29.6", "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.17.3", "@babel/plugin-proposal-private-methods": "^7.18.6", diff --git a/requirements.txt b/requirements.txt index 747f5d7d6..5a0729da8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,11 +34,11 @@ huggingface_hub numpymaxflow==0.0.7; python_version < "3.13" setuptools>=61 setuptools-scm<8.0.0 -girder-client==3.2.3 +girder-client==3.2.9 ninja==1.11.1.1 einops==0.7.0 pyyaml==6.0.1 -filelock==3.20.3 +filelock==4.2.1 passlib==1.7.4 pyjwt==2.15.0 bcrypt==4.1.2 diff --git a/setup.cfg b/setup.cfg index a1a846106..0745b5f93 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ project_urls = Source Code=https://github.com/Project-MONAI/MONAILabel [options] -python_requires = >= 3.10 +python_requires = >= 3.11 # for compiling and develop setup only # no need to specify the versions so that we could # compile for multiple targeted versions. @@ -57,11 +57,11 @@ install_requires = SimpleITK pyOpenSSL>=26.0.0 huggingface_hub - girder-client>=3.2.3 + girder-client>=3.2.9 ninja>=1.11.1.1 einops>=0.7.0 pyyaml>=6.0.1 - filelock>=3.11.0 + filelock>=4.2.1 passlib>=1.7.4 pyjwt>=2.8.0 bcrypt>=4.1.2