Add Python 3.13/3.14 support and docs updates (#4248)

pcnudde · web-flow · commit aaf5b139ed86 · 2026-03-10T17:45:37.000-07:00
## Summary
- add Python 3.13 and 3.14 support metadata and CI matrix coverage
- update auto-format workflow to run with Python 3.14 and black 26.1.0
- remove deprecated distutils usage in setup.py for Python 3.12+
- update installation and release-note docs for Python 3.13/3.14 support
- keep TensorFlow integration test path on Python 3.12 for compatibility
diff --git a/.github/workflows/auto-format.yml b/.github/workflows/auto-format.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: 3.14
 
       # versions need to be consistent with setup.cfg
       - name: Install isort
@@ -30,7 +30,7 @@ jobs:
         run: python -m isort $DIRS
 
       - name: Install black
-        run: pip install black==24.8.0
+        run: pip install black==25.9.0
 
       - name: Run black
         run: python -m black $DIRS
@@ -48,4 +48,3 @@ jobs:
           git add .
           git diff --cached --quiet || git commit -m "Auto format with black"
           git push
-
diff --git a/.github/workflows/premerge.yml b/.github/workflows/premerge.yml
@@ -21,13 +21,24 @@ on:
   workflow_dispatch:
 
 jobs:
+  style-check:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14"
+      - name: Run style checks
+        run: ./runtest.sh -s
+
   unit-tests:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-22.04, ubuntu-24.04 ]
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -40,15 +51,15 @@ jobs:
           python3 -m pip install --no-cache-dir -e .[dev]
           python3 -m pip install --no-cache-dir --no-deps "flwr>=1.16,<1.26"
       - name: Run unit test
-        run: ./runtest.sh
+        run: ./runtest.sh --numprocesses=auto -u
 
   wheel-build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-22.04, ubuntu-24.04 ]
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/AGENTS.md b/AGENTS.md
@@ -19,7 +19,7 @@
 ## Style and Testing Conventions
 
 - Format/lint stack: black (line length 120), flake8, isort (black profile).
-- Python support targets: 3.9, 3.10, 3.11, 3.12.
+- Python support targets: 3.9, 3.10, 3.11, 3.12, 3.13, 3.14.
 - Add the standard NVIDIA Apache-2.0 license header to new Python source files.
 - Unit tests live in `tests/unit_test/`; integration tests live in `tests/integration_test/`.
 - Test file names follow `[module_name]_test.py`.
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -119,7 +119,7 @@ nvflare/
 - **Formatter**: black (line length: 120)
 - **Linter**: flake8
 - **Import sorter**: isort (black profile)
-- **Python**: 3.9, 3.10, 3.11, 3.12
+- **Python**: 3.9, 3.10, 3.11, 3.12, 3.13, 3.14
 
 All Python files must include Apache 2.0 license header:
 ```python
@@ -149,4 +149,3 @@ Create a `CLAUDE.local.md` file (git-ignored) for personal preferences such as:
 - Preferred coding patterns
 - Local environment specifics
 - Custom shortcuts or workflows
-
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -10,7 +10,7 @@ from the :ref:`fl_introduction` and have reviewed the :ref:`flare_overview` to u
 
 Prerequisites
 =============
-- Python 3.9+
+- Python 3.9+ (tested through Python 3.14, including Python 3.13)
 - pip
 - Git
 
@@ -35,7 +35,7 @@ Virtual Environments and Packages
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Python's official document explains the main idea about virtual environments.
-The module used to create and manage virtual environments is called `venv <https://docs.python.org/3.10/library/venv.html>`_.
+The module used to create and manage virtual environments is called `venv <https://docs.python.org/3/library/venv.html>`_.
 You can find more information there. We only describe a few necessary steps for a virtual environment for NVIDIA FLARE.
 
 Depending on your OS and the Python distribution, you may need to install the Python's venv package separately. For example, in Ubuntu
@@ -89,12 +89,22 @@ NVFlare provides several optional dependency groups that you can install based o
 
      $ pip install nvflare[HE]
 
+  .. note::
+
+     ``nvflare[HE]`` currently supports Python 3.9-3.13.
+     On Python 3.14, ``tenseal`` is not available yet, so the HE extra is not installed.
+
 * **PSI** - Private Set Intersection support:
 
   .. code-block:: shell
 
      $ pip install nvflare[PSI]
 
+  .. note::
+
+     ``nvflare[PSI]`` currently supports Python 3.9-3.13.
+     On Python 3.14, ``openmined.psi`` is not available yet, so the PSI extra is not installed.
+
 * **PT** - PyTorch support:
 
   .. code-block:: shell
@@ -205,7 +215,7 @@ To build wheels for specific platforms or Python versions, you can use the follo
 .. code-block:: shell
 
   # For a specific Python version
-  $ PYTHON=python3.9 python -m build
+  $ PYTHON=python3.14 python -m build
 
   # For a specific platform
   $ PLATFORM=linux_x86_64 python -m build
diff --git a/docs/release_notes/flare_272.rst b/docs/release_notes/flare_272.rst
@@ -210,6 +210,11 @@ Documentation
 
 - **Job Recipe Guide**: Updated :doc:`/user_guide/data_scientist_guide/job_recipe` with dict model config and initial checkpoint examples.
 
+Python Compatibility
+~~~~~~~~~~~~~~~~~~~~
+
+- Added official support for Python 3.13 and Python 3.14, including packaging metadata and CI test matrix updates.
+
 Bug Fixes
 ~~~~~~~~~
 
@@ -253,5 +258,3 @@ For more examples and tutorials, see:
 - `Hello World Examples <https://github.com/NVIDIA/NVFlare/tree/main/examples/hello-world>`_
 - `Advanced Examples <https://github.com/NVIDIA/NVFlare/tree/main/examples/advanced>`_
 - `Self-Paced Training Tutorials <https://github.com/NVIDIA/NVFlare/tree/main/examples/tutorials/self-paced-training>`_
-
-
diff --git a/examples/advanced/bionemo/task_fitting/job_fedavg/job.py b/examples/advanced/bionemo/task_fitting/job_fedavg/job.py
@@ -15,7 +15,7 @@
 """
 Federated MLP Training using FedAvgRecipe with PyTorch
 
-This script uses PyTorch-based federated learning to train an MLP classifier 
+This script uses PyTorch-based federated learning to train an MLP classifier
 on protein embeddings for subcellular location prediction.
 Run this after inference to train an MLP classifier on the embeddings.
 """
diff --git a/examples/advanced/federated-policies/client.py b/examples/advanced/federated-policies/client.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    client side training scripts
+client side training scripts
 """
 
 import argparse
diff --git a/examples/advanced/job-level-authorization/client.py b/examples/advanced/job-level-authorization/client.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    client side training scripts
+client side training scripts
 """
 
 import argparse
diff --git a/examples/hello-world/hello-dp/model.py b/examples/hello-world/hello-dp/model.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    Simple MLP model for tabular data
+Simple MLP model for tabular data
 """
 
 import torch.nn as nn
diff --git a/examples/hello-world/hello-numpy/client.py b/examples/hello-world/hello-numpy/client.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    client side training scripts
+client side training scripts
 """
 
 import argparse
diff --git a/examples/hello-world/hello-pt/model.py b/examples/hello-world/hello-pt/model.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    pytorch model
+pytorch model
 """
 
 import torch
diff --git a/examples/tutorials/client.py b/examples/tutorials/client.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    client side training scripts
+client side training scripts
 """
 
 import argparse
diff --git a/examples/tutorials/code/client.py b/examples/tutorials/code/client.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    client side training scripts
+client side training scripts
 """
 
 import argparse
diff --git a/examples/tutorials/code/model.py b/examples/tutorials/code/model.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    pytorch model
+pytorch model
 """
 
 import torch
diff --git a/examples/tutorials/model.py b/examples/tutorials/model.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-    pytorch model
+pytorch model
 """
 
 import torch
diff --git a/nvflare/app_common/workflows/lr/fedavg.py b/nvflare/app_common/workflows/lr/fedavg.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-   Federated Averaging for Logistic Regression with Newton-Raphson method
-   using Numpy
+Federated Averaging for Logistic Regression with Newton-Raphson method
+using Numpy
 """
 from typing import List, Optional
 
diff --git a/nvflare/private/fed/client/client_runner.py b/nvflare/private/fed/client/client_runner.py
@@ -365,14 +365,23 @@ def _do_task(self, task: TaskAssignment, fl_ctx: FLContext, abort_signal: Signal
 
             try:
                 reply = executor.execute(task.name, task.data, fl_ctx, abort_signal)
-            finally:
+            except BaseException:
                 if abort_signal.triggered:
                     return self._reply_and_audit(
                         reply=make_reply(ReturnCode.TASK_ABORTED),
                         ref=server_audit_event_id,
                         fl_ctx=fl_ctx,
                         msg=f"submit result: {ReturnCode.TASK_ABORTED}",
                     )
+                raise
+
+            if abort_signal.triggered:
+                return self._reply_and_audit(
+                    reply=make_reply(ReturnCode.TASK_ABORTED),
+                    ref=server_audit_event_id,
+                    fl_ctx=fl_ctx,
+                    msg=f"submit result: {ReturnCode.TASK_ABORTED}",
+                )
 
             if not isinstance(reply, Shareable):
                 self.log_error(
diff --git a/nvflare/private/fed/server/server_runner.py b/nvflare/private/fed/server/server_runner.py
@@ -175,8 +175,8 @@ def _execute_run(self):
                     self.fire_event(EventType.END_WORKFLOW, fl_ctx)
 
                 # Stopped the server runner from the current responder, not continue the following responders.
-                if self.abort_signal.triggered:
-                    break
+            if self.abort_signal.triggered:
+                break
             self.current_wf_index += 1
 
     def run(self):
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ skip_glob = [ "*.pyi", "**/*_pb2*" ]
 
 [tool.black]
 line-length = 120
-target-version = ["py39", "py310", "py311", "py312"]
+target-version = ["py39", "py310", "py311", "py312", "py313", "py314"]
 include = '\.pyi?$'
 exclude = '''
 (
@@ -34,4 +34,3 @@ exclude = '''
   | _version.py
 )
 '''
-
diff --git a/runtest.sh b/runtest.sh
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/tests/integration_test/client.py b/tests/integration_test/client.py
diff --git a/tests/unit_test/app_common/statistics/stats_def_test.py b/tests/unit_test/app_common/statistics/stats_def_test.py
diff --git a/tests/unit_test/fuel/utils/component_builder_test.py b/tests/unit_test/fuel/utils/component_builder_test.py
diff --git a/tests/unit_test/recipe/server_memory_gc_rounds_test.py b/tests/unit_test/recipe/server_memory_gc_rounds_test.py
