Merge branch '2.5' into 2.5_split

NVIDIA · Oct 10, 2024 · 7ced281 · 7ced281
2 parents 49cb1dd + 8708326
commit 7ced281
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/integration/monai/setup.py b/integration/monai/setup.py
@@ -24,14 +24,14 @@
 release = os.environ.get("MONAI_NVFL_RELEASE")
 if release == "1":
     package_name = "monai-nvflare"
-    version = "0.2.9"
+    version = "0.3.0"
 else:
     package_name = "monai-nvflare-nightly"
     today = datetime.date.today().timetuple()
     year = today[0] % 1000
     month = today[1]
     day = today[2]
-    version = f"0.2.9.{year:02d}{month:02d}{day:02d}"
+    version = f"0.3.0.{year:02d}{month:02d}{day:02d}"
 
 setup(
     name=package_name,
@@ -48,14 +48,15 @@
     ),
     license_files=("LICENSE",),
     classifiers=[
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX :: Linux",
     ],
     long_description=long_description,
     long_description_content_type="text/markdown",
-    python_requires=">=3.8,<3.11",
-    install_requires=["monai>=1.3.1", "nvflare~=2.5.0rc"],
+    python_requires=">=3.9,<3.13",
+    install_requires=["monai>=1.3.1", "nvflare~=2.5.1rc"],
 )
diff --git a/nvflare/app_opt/pt/job_config/model.py b/nvflare/app_opt/pt/job_config/model.py
@@ -24,7 +24,7 @@
 
 
 class PTModel:
-    def __init__(self, model, persistor: Optional[ModelPersistor], locator: Optional[ModelLocator]):
+    def __init__(self, model, persistor: Optional[ModelPersistor] = None, locator: Optional[ModelLocator] = None):
         """PyTorch model wrapper.
 
         If model is an nn.Module, add a PTFileModelPersistor with the model and a TFModelPersistor.

diff --git a/setup.cfg b/setup.cfg
@@ -6,7 +6,6 @@ long_description_content_type = text/markdown; charset=UTF-8
 license_files =
     LICENSE
 classifiers =
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
@@ -16,7 +15,7 @@ classifiers =
 
 [options]
 zip_safe = True
-python_requires = >= 3.8
+python_requires = >=3.9, <3.13
 install_requires =
     cryptography>=36.0.0
     Flask==3.0.2