diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index c224c0566..ca8dfff0f 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.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v4 - name: Set up Python @@ -50,7 +50,7 @@ jobs: MONAI_ZOO_AUTH_TOKEN: ${{ github.token }} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v4 - name: Set up Python @@ -83,7 +83,7 @@ jobs: MONAI_ZOO_AUTH_TOKEN: ${{ github.token }} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v4 with: @@ -144,7 +144,7 @@ jobs: MONAI_ZOO_AUTH_TOKEN: ${{ github.token }} strategy: matrix: - python-version: ["3.8", "3.9"] + python-version: ["3.9"] steps: - uses: actions/checkout@v4 - name: Set up Python diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04c69dfcc..4295b9d50 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,10 +35,10 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-node@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.9 - name: Cache for pip uses: actions/cache@v4 id: cache diff --git a/Dockerfile b/Dockerfile index 3a5d20268..18617c9fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,8 @@ # please run `./runtests.sh --clean && DOCKER_BUILDKIT=1 docker build -t projectmonai/monailabel:latest .` # to use different version of MONAI pass `--build-arg MONAI_IMAGE=...` -ARG MONAI_IMAGE=projectmonai/monai:1.3.1 +ARG MONAI_IMAGE=projectmonai/monai:1.4.0 + ARG NODE_IMAGE=node:slim FROM ${NODE_IMAGE} as ohifbuild diff --git a/requirements.txt b/requirements.txt index ac47eba05..7f8a99ea7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -monai[nibabel, skimage, pillow, tensorboard, gdown, ignite, torchvision, itk, tqdm, lmdb, psutil, openslide, fire, mlflow]>=1.3.1 +monai[nibabel, skimage, pillow, tensorboard, gdown, ignite, torchvision, itk, tqdm, lmdb, psutil, openslide, fire, mlflow]>=1.4.0 uvicorn==0.29.0 pydantic==2.7.0 pydantic-settings==2.2.1 diff --git a/sample-apps/endoscopy/lib/configs/inbody.py b/sample-apps/endoscopy/lib/configs/inbody.py index 12bd5a32e..a9997c1f7 100644 --- a/sample-apps/endoscopy/lib/configs/inbody.py +++ b/sample-apps/endoscopy/lib/configs/inbody.py @@ -35,7 +35,7 @@ def init(self, name: str, model_dir: str, conf: Dict[str, str], planner: Any, ** super().init(name, model_dir, conf, planner, **kwargs) bundle_name = "endoscopic_inbody_classification" - version = conf.get("inbody", "0.4.8") + version = conf.get("inbody", "0.4.9") zoo_source = conf.get("zoo_source", settings.MONAI_ZOO_SOURCE) self.bundle_path = os.path.join(self.model_dir, bundle_name) diff --git a/sample-apps/endoscopy/lib/configs/tooltracking.py b/sample-apps/endoscopy/lib/configs/tooltracking.py index 4c3a87771..d273dc24f 100644 --- a/sample-apps/endoscopy/lib/configs/tooltracking.py +++ b/sample-apps/endoscopy/lib/configs/tooltracking.py @@ -35,7 +35,7 @@ def init(self, name: str, model_dir: str, conf: Dict[str, str], planner: Any, ** super().init(name, model_dir, conf, planner, **kwargs) bundle_name = "endoscopic_tool_segmentation" - version = conf.get("tooltracking", "0.5.9") + version = conf.get("tooltracking", "0.6.0") zoo_source = conf.get("zoo_source", settings.MONAI_ZOO_SOURCE) self.bundle_path = os.path.join(self.model_dir, bundle_name) diff --git a/sample-apps/pathology/lib/configs/classification_nuclei.py b/sample-apps/pathology/lib/configs/classification_nuclei.py index da04b1cb3..e35e18187 100644 --- a/sample-apps/pathology/lib/configs/classification_nuclei.py +++ b/sample-apps/pathology/lib/configs/classification_nuclei.py @@ -31,7 +31,7 @@ def init(self, name: str, model_dir: str, conf: Dict[str, str], planner: Any, ** bundle_name = "pathology_nuclei_classification" zoo_source = conf.get("zoo_source", settings.MONAI_ZOO_SOURCE) - version = conf.get("classification_nuclei", "0.1.7") + version = conf.get("classification_nuclei", "0.2.0") self.bundle_path = os.path.join(self.model_dir, bundle_name) if not os.path.exists(self.bundle_path): diff --git a/sample-apps/pathology/lib/configs/hovernet_nuclei.py b/sample-apps/pathology/lib/configs/hovernet_nuclei.py index a5843e2c1..f74903703 100644 --- a/sample-apps/pathology/lib/configs/hovernet_nuclei.py +++ b/sample-apps/pathology/lib/configs/hovernet_nuclei.py @@ -31,7 +31,7 @@ def init(self, name: str, model_dir: str, conf: Dict[str, str], planner: Any, ** bundle_name = "pathology_nuclei_segmentation_classification" zoo_source = conf.get("zoo_source", settings.MONAI_ZOO_SOURCE) - version = conf.get("hovernet_nuclei", "0.2.4") + version = conf.get("hovernet_nuclei", "0.2.6") self.bundle_path = os.path.join(self.model_dir, bundle_name) if not os.path.exists(self.bundle_path): diff --git a/sample-apps/pathology/lib/configs/nuclick.py b/sample-apps/pathology/lib/configs/nuclick.py index 2165a4602..582a55ed6 100644 --- a/sample-apps/pathology/lib/configs/nuclick.py +++ b/sample-apps/pathology/lib/configs/nuclick.py @@ -31,7 +31,7 @@ def init(self, name: str, model_dir: str, conf: Dict[str, str], planner: Any, ** bundle_name = "pathology_nuclick_annotation" zoo_source = conf.get("zoo_source", settings.MONAI_ZOO_SOURCE) - version = conf.get("nuclick", "0.1.9") + version = conf.get("nuclick", "0.2.1") self.bundle_path = os.path.join(self.model_dir, bundle_name) if not os.path.exists(self.bundle_path): diff --git a/setup.cfg b/setup.cfg index 6219dc017..a23cc7801 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.8 +python_requires = >= 3.9 # for compiling and develop setup only # no need to specify the versions so that we could # compile for multiple targeted versions. @@ -35,7 +35,7 @@ setup_requires = torch ninja install_requires = - monai[nibabel, skimage, pillow, tensorboard, gdown, ignite, torchvision, itk, tqdm, lmdb, psutil, openslide, fire, mlflow]>=1.3.1 + monai[nibabel, skimage, pillow, tensorboard, gdown, ignite, torchvision, itk, tqdm, lmdb, psutil, openslide, fire, mlflow]>=1.4.0 uvicorn>=0.29.0 pydantic>=2.7.0 pydantic-settings>=2.2.1