diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6dbf9a5..969be2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: # Add multiple Python versions here to run tests on new(er) versions. - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.12", "3.13"] fail-fast: false steps: - uses: actions/checkout@v3 @@ -44,7 +44,7 @@ jobs: strategy: matrix: # Add multiple Python versions here to run tests on new(er) versions. - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.12", "3.13"] fail-fast: false # Step 1 to make GUIs work, see https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html env: diff --git a/.github/workflows/coding-style.yml b/.github/workflows/coding-style.yml index aca0632..3dbf0c1 100644 --- a/.github/workflows/coding-style.yml +++ b/.github/workflows/coding-style.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: # Add the Python versions here to run tests on new(er) versions. - python-version: ["3.12"] + python-version: ["3.13"] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -43,7 +43,7 @@ jobs: strategy: matrix: # Add multiple Python versions here to run tests on new(er) versions. - python-version: ["3.12"] + python-version: ["3.13"] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml index 63d30d0..73fae95 100644 --- a/.github/workflows/regression-tests.yml +++ b/.github/workflows/regression-tests.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: # Add multiple Python versions here to run tests on new(er) versions. - python-version: ["3.12"] + python-version: ["3.13"] # Step 1 to make GUIs work, see https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html env: DISPLAY: ':99.0' @@ -75,7 +75,7 @@ jobs: strategy: matrix: # Select Python version to be used for compiling here. - python-version: ["3.12"] + python-version: ["3.13"] steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 74ba6e4..2714e07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ New releases are marked in the repository using tags. Simply checkout the master - Refactoring of 'equations' - Added regressions tests based on the DC3 - Multiple small fixes collected through the last year -- Dependencies: switch to PySide6 (for GUIs) and to Jupyter Book 2 (for tutorials) +- Continuous integration tests look good for Python 3.13 +- Dependencies: switch to PySide6 (for GUIs) and to Jupyter Book 2 (for tutorials), limit Pandas to versions <3.0.0 and Numpy to versions <2.4.0 # Release 2025.01 - Update of flutter solution sequence including updated description in the User Guide and of the tutorials diff --git a/setup.py b/setup.py index 2058cec..eb538fe 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ Install Loads Kernel with core dependencies via: - pip install -e To use the graphical tools and other features, optional libraries definded as extras are necessary: -- pip install -e [extra] +- pip install -e [extras] Especially with mpi or the graphical libraries, pip frequently fails. In that case, try to install the packages using a package manager such as conda. """ @@ -30,6 +30,7 @@ def my_setup(): include_package_data=True, package_data={'loadskernel': ['graphics/*.*'], 'loadscompare': ['graphics/*.*'], }, + # Remember to update the requirements also in the conda feedstock (./recipe/meta.yml) when changing them here! python_requires='>=3.10', install_requires=['PanelAero', 'matplotlib', @@ -38,7 +39,9 @@ def my_setup(): 'h5py', 'tables', 'pyyaml', - 'pandas', + # Pandas 3.0.0 comes with changes that are not yet supported, + # see https://github.com/DLR-AE/LoadsKernel/issues/86 + 'pandas<3.0.0', ], extras_require={'extras': ['mpi4py', 'mayavi', diff --git a/tests/list_of_packages.txt b/tests/list_of_packages.txt index ba79d51..723abaf 100644 --- a/tests/list_of_packages.txt +++ b/tests/list_of_packages.txt @@ -8,7 +8,7 @@ scipy h5py pytables pyyaml -pandas +pandas<3.0.0 # Extras, optional mpi4py