Updates to the Python module build (#1387)

Author: bcoconni

.github/workflows/cpp-python-build.yml

@@ -106,11 +106,11 @@ jobs:
           path: |
             ~/.cache/pip
             build/Testing/Temporary/CTestCostData.txt
-          key: ${{ runner.os }}-3.9-${{ hashFiles('tests/CMakeLists.txt', 'python/requirements.txt') }}
-      - name: Set up Python 3.9
+          key: ${{ runner.os }}-3.10-${{ hashFiles('tests/CMakeLists.txt', 'python/requirements.txt') }}
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Python packages
         run: |
           pip install -r python/requirements.txt
@@ -312,11 +312,11 @@ jobs:
           path: |
             ~\AppData\Local\pip\Cache
             build\Testing\Temporary\CTestCostData.txt
-          key: ${{ runner.os }}-3.9-${{ hashFiles('tests\CMakeLists.txt', 'python\requirements.txt') }}
-      - name: Set up Python 3.9
+          key: ${{ runner.os }}-3.10-${{ hashFiles('tests\CMakeLists.txt', 'python\requirements.txt') }}
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Python packages
         run: pip install -r python/requirements.txt
       - name: Checkout CxxTest
@@ -550,10 +550,10 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Python packages
         run: pip install -U cython 'numpy>=1.20' mypy
       - name: Download source package
@@ -596,10 +596,10 @@ jobs:
     steps:
       - name: Checkout JSBSim
         uses: actions/checkout@v6
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Python packages
         run: pip install -U cython 'numpy>=1.20' mypy
       - name: Install Doxygen (Linux)
@@ -655,7 +655,7 @@ jobs:
           Copy-Item -Path .\JSBSim-*\jsbsim\*.pyi -Destination ..\..\build\python\jsbsim
           echo "::endgroup::"
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.23
+        uses: pypa/cibuildwheel@v3.3
         env:
           CIBW_BEFORE_ALL_LINUX: |
             cd build
@@ -774,10 +774,10 @@ jobs:
           find . -type f -name *.deb -exec cp {} GH_release/. \;
 
       # PyPI deployment
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: PyPI deployment
         uses: pypa/gh-action-pypi-publish@release/v1
 
@@ -889,10 +889,10 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install doxygen graphviz
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Python packages
         run: pip install -U 'numpy>=1.20' sphinx cython
       - name: Checkout JSBSim

README.md

@@ -77,7 +77,7 @@ Debian packages for Ubuntu Linux "Jammy" 22.04 LTS and "Noble" 24.04 LTS for 64
 
 ### Python module
 
-JSBSim provides binary wheel packages for its Python module on Windows, Mac OSX and Linux platforms for several Python versions (3.9, 3.10, 3.11, 3.12 and 3.13). These can be installed using either `pip` or `conda`.
+JSBSim provides binary wheel packages for its Python module on Windows, Mac OSX and Linux platforms for several Python versions (3.10, 3.11, 3.12, 3.13 and 3.14). These can be installed using either `pip` or `conda`.
 
 #### Installation with `pip`
 

python/pyproject.toml

@@ -1,19 +1,16 @@
 [build-system]
 # Exclude Cython version 0.29.26 as it fails building wheels for PyPy38
-#
-# Require setuptools >= 60.0.0 to be able to access its local copy of distutils
-# as distutils is deprecated for Python 3.10+ and will no longer be distributed
-# with Python 3.12+.
-requires = ["setuptools>=60.0.0,<72.0.0", "cython!=0.29.26"]
+# Require setuptools 72.1.0 for PyPy (see issue #2676 on pypa/cibuildwheel
+# GitHub project page)
+requires = [
+    "setuptools==72.1.0; platform_python_implementation == 'PyPy' and python_version < '3.11'",
+    "setuptools", "cython!=0.29.26"
+]
 build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
 manylinux-x86_64-image = "manylinux2014"
 manylinux-i686-image = "manylinux2014"
+enable = ["pypy", "pypy-eol"]
 # Skip building against musl libc images as JSBSim is not compatible with them.
 skip = "cp*-musllinux_*"
-
-[[tool.cibuildwheel.overrides]]
-select = "pp38-* cp38*"
-manylinux-x86_64-image = "manylinux2010"
-manylinux-i686-image = "manylinux2010"

python/setup.py.in

@@ -179,7 +179,7 @@ setup(
     long_description="JSBSim is a multi-platform, general purpose object-oriented Flight Dynamics Model (FDM) written in C++. The FDM is essentially the physics & math model that defines the movement of an aircraft, rocket, etc., under the forces and moments applied to it using the various control mechanisms and from the forces of nature. JSBSim can be run in a standalone batch mode flight simulator (no graphical displays) for testing and study, or integrated with [FlightGear](http://home.flightgear.org/) or other flight simulator.",
     long_description_content_type="text/markdown",
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Intended Audience :: Science/Research",
         "Intended Audience :: Other Audience",
@@ -189,6 +189,9 @@ setup(
         "Operating System :: MacOS :: MacOS X",
         "Programming Language :: C++",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "Programming Language :: Cython",
         "Topic :: Education",
         "Topic :: Games/Entertainment :: Simulation",
         "Topic :: Scientific/Engineering",
@@ -198,7 +201,7 @@ setup(
     scripts=['JSBSim.py'],
     install_requires=['numpy>=1.20'],
     ext_modules=[Extension('jsbsim._jsbsim', language='c++', **ext_kwargs)],
-    python_requires=">=3.9",
+    python_requires=">=3.10",
     packages=['jsbsim'],
     package_data={'jsbsim': package_data_files},
     zip_safe=False,  # needed for mypy to find the type hints stubs