From cc3ba576aec078c3e4ae116d1b5bff9de61f39e8 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 15 Nov 2024 09:07:58 +0000 Subject: [PATCH 1/2] Upgrade to 3.13 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/documentation.yml | 2 +- docs/installation/pipx-based.rst | 4 ++-- pyproject.toml | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4c726cb0..a3be8f75b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] # Test with the earliest and the latest python versions supported - python-version: ["3.9", "3.12"] + python-version: ["3.9", "3.13"] steps: - uses: actions/checkout@v4 @@ -59,7 +59,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] # Test with the earliest and the latest python versions supported - python-version: ["3.9", "3.12"] + python-version: ["3.9", "3.13"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index c4d14b92c..676e9a86c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.12 + python-version: 3.13 - name: Install dependencies run: | sudo apt update -y diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst index 880c28405..4aed5c30d 100644 --- a/docs/installation/pipx-based.rst +++ b/docs/installation/pipx-based.rst @@ -6,7 +6,7 @@ pipx-based installation To help you installing MUSE in your system we will follow these steps: - `Launching a terminal`_: Needed to both install and run MUSE. -- `Installing a compatible Python version`_: MUSE works with Python 3.9 to 3.12. +- `Installing a compatible Python version`_: MUSE works with Python 3.9 to 3.13. - `Installing pipx`_: A Python application manager that facilitates installing, keeping applications updated and run them in their own isolated environments. - `Installing MUSE itself`_ @@ -67,7 +67,7 @@ Once you have launched the Terminal, the window that opens will show the command Installing a compatible Python version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -MUSE needs Python to run and it works with versions 3.9 to 3.12, so the next step is to install a suitable version of Python. +MUSE needs Python to run and it works with versions 3.9 to 3.13, so the next step is to install a suitable version of Python. .. note:: diff --git a/pyproject.toml b/pyproject.toml index 3c1367527..c619c9f39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ name = "MUSE_OS" description = "Energy System Model" readme = "README.md" license = {file = "LICENSE"} -requires-python = ">= 3.9, <3.13" +requires-python = ">= 3.9, <3.14" keywords = ["energy", "modelling"] classifiers = [ "Development Status :: 4 - Beta", @@ -19,6 +19,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Intended Audience :: Science/Research", "Intended Audience :: Other Audience", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)" From d624a0e35d658fe291339af8766b0d06c9f67798 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 20 Nov 2024 10:11:02 +0000 Subject: [PATCH 2/2] Unpin numpy --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c619c9f39..421eb1c9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ "License :: OSI Approved :: GNU General Public License v3 (GPLv3)" ] dependencies = [ - "numpy==2.0", + "numpy>=2.0", "scipy>=1.13", "pandas>=2.2", "xarray>=2024.6",