Merge pull request #289 from EnergySystemsModellingLab/upgrade

Upgrade and un-pin dependencies and Python version to use

Author: dalonsoa

.github/workflows/ci.yml

@@ -15,7 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9"]
+        # Test with the earliest and the latest python versions supported
+        python-version: ["3.9", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -26,10 +27,7 @@ jobs:
           cache: pip
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip==22.1.2
-          pip install -U setuptools==62.6.0 wheel xlrd==1.2.0
-          pip install -e .[all]
+        run: pip install -e .[all]
 
       # The unit tests, with coverage under linux
       - name: Unit tests (linux)
@@ -60,7 +58,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9"]
+        # Test with the earliest and the latest python versions supported
+        python-version: ["3.9", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -70,10 +69,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip==22.1.2
-          pip install -U setuptools==62.6.0 wheel xlrd==1.2.0
-          pip install -e .[all]
+        run: pip install -e .[all]
 
       # The regression tests (with non coverage)
       - name: Regression tests

.github/workflows/documentation.yml

@@ -13,14 +13,12 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
       - name: Install dependencies
         run: |
           sudo apt update -y
           sudo apt install -y pandoc graphviz latexmk texlive-latex-recommended \
                   texlive-latex-extra texlive-fonts-recommended
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade setuptools==62.6.0 wheel
           python -m pip install -e .[doc,dev]
       - name: Generate results for default model
         run: |

.vscode/launch.json

@@ -20,7 +20,7 @@
         },
         {
             "name": "Model: default_timeslice",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "muse",
             "args": ["--model", "default_timeslice"]

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`_: At the moment, MUSE works with Python 3.8 and 3.9.
+- `Installing a compatible Python version`_: MUSE works with Python 3.9 to 3.12.
 - `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 but, for now, it only works with versions 3.8 and 3.9, 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.12, so the next step is to install a suitable version of Python.
 
 .. note::
 
@@ -92,7 +92,7 @@ The first thing will be to check if you already have a suitable python version i
 
     python --version
 
-If the output is ``Python 3.8.X`` or ``Python 3.9.X``, where ``X`` is any number, then **you have a version of Python compatible with MUSE and you can skip this section altogether**. Move to `Installing pipx`_. In any other case, keep reading.
+If the output is ``Python 3.Y.X`` or ``Python 3.Y.X``, where ``X`` is any number and ``Y`` is 9, 10, 11 or 12, then **you have a version of Python compatible with MUSE and you can skip this section altogether**. Move to `Installing pipx`_. In any other case, keep reading.
 
 There are multiple ways of installing Python, as well as multiple distributions. Here we have opted for the one that we believe is simplest, requires the smallest downloads and gives the maximum flexibility: using ``pyenv``.
 

docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv

@@ -21,47 +21,43 @@
 8,A1,6.90000000000,R1,14,2025,R1,residential,heatpump,retrofit,2035
 9,A1,25.00000000000,R1,15,2030,R1,residential,heatpump,retrofit,2035
 0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
-21,A1,10.00000000000,R1,26,2020,R1,power,solarPV,retrofit,2035
-22,A1,2.40000000000,R1,27,2025,R1,power,solarPV,retrofit,2035
-23,A1,6.00000000000,R1,28,2030,R1,power,solarPV,retrofit,2035
-48,A1,6.75000000000,R1,78,2020,R1,power,windturbine,retrofit,2035
+10,A1,10.00000000000,R1,11,2020,R1,power,solarPV,retrofit,2035
+11,A1,2.40000000000,R1,12,2025,R1,power,solarPV,retrofit,2035
+12,A1,6.00000000000,R1,13,2030,R1,power,solarPV,retrofit,2035
+37,A1,6.75000000000,R1,55,2020,R1,power,windturbine,retrofit,2035
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
 2,A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2040
 6,A1,25.00000000000,R1,7,2030,R1,residential,heatpump,retrofit,2040
 7,A1,16.09000000000,R1,8,2035,R1,residential,heatpump,retrofit,2040
 0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
-1,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2040
-20,A1,10.00000000000,R1,24,2020,R1,power,solarPV,retrofit,2040
-21,A1,2.40000000000,R1,25,2025,R1,power,solarPV,retrofit,2040
-22,A1,6.00000000000,R1,26,2030,R1,power,solarPV,retrofit,2040
-23,A1,10.00000000000,R1,27,2035,R1,power,solarPV,retrofit,2040
-44,A1,6.75000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
-45,A1,6.75000000000,R1,73,2035,R1,power,windturbine,retrofit,2040
+9,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2040
+10,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2040
+11,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2040
+12,A1,9.19000000000,R1,15,2035,R1,power,solarPV,retrofit,2040
+43,A1,6.75000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
 2,A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2045
 4,A1,16.09000000000,R1,7,2035,R1,residential,heatpump,retrofit,2045
 5,A1,31.00000000000,R1,8,2040,R1,residential,heatpump,retrofit,2045
 2,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
-3,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2045
-20,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2045
-21,A1,2.40000000000,R1,23,2025,R1,power,solarPV,retrofit,2045
-22,A1,6.00000000000,R1,24,2030,R1,power,solarPV,retrofit,2045
-23,A1,10.00000000000,R1,25,2035,R1,power,solarPV,retrofit,2045
-48,A1,6.75000000000,R1,77,2020,R1,power,windturbine,retrofit,2045
-49,A1,6.75000000000,R1,78,2035,R1,power,windturbine,retrofit,2045
+10,A1,10.00000000000,R1,13,2020,R1,power,solarPV,retrofit,2045
+11,A1,2.40000000000,R1,14,2025,R1,power,solarPV,retrofit,2045
+12,A1,6.00000000000,R1,15,2030,R1,power,solarPV,retrofit,2045
+13,A1,9.19000000000,R1,16,2035,R1,power,solarPV,retrofit,2045
+14,A1,6.00000000000,R1,17,2040,R1,power,solarPV,retrofit,2045
+50,A1,6.75000000000,R1,91,2020,R1,power,windturbine,retrofit,2045
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
 0,A1,31.00000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
 1,A1,23.00000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
 0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
-1,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2050
-14,A1,2.40000000000,R1,22,2025,R1,power,solarPV,retrofit,2050
-15,A1,6.00000000000,R1,23,2030,R1,power,solarPV,retrofit,2050
-16,A1,10.00000000000,R1,24,2035,R1,power,solarPV,retrofit,2050
-17,A1,16.91000000000,R1,25,2045,R1,power,solarPV,retrofit,2050
-42,A1,6.75000000000,R1,77,2035,R1,power,windturbine,retrofit,2050
-43,A1,3.56000000000,R1,78,2045,R1,power,windturbine,retrofit,2050
+6,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2050
+7,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2050
+8,A1,9.19000000000,R1,15,2035,R1,power,solarPV,retrofit,2050
+9,A1,6.00000000000,R1,16,2040,R1,power,solarPV,retrofit,2050
+10,A1,16.91000000000,R1,17,2045,R1,power,solarPV,retrofit,2050
+46,A1,6.75000000000,R1,91,2045,R1,power,windturbine,retrofit,2050
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050