Merge develop again

.github/workflows/publish_pypi.yml

@@ -109,10 +109,19 @@ jobs:
             delocate-wheel -v -w {dest_dir} {wheel}
           CIBW_SKIP: "pp* *musllinux*"
 
-      - name: Upload wheels
+      - name: Upload wheels for Linux
         uses: actions/upload-artifact@v4
+        if: matrix.os == 'ubuntu-latest'
         with:
-          name: wheels
+          name: linux_wheels
+          path: ./wheelhouse/*.whl
+          if-no-files-found: error
+
+      - name: Upload wheels for macOS
+        uses: actions/upload-artifact@v4
+        if: matrix.os == 'macos-latest'
+        with:
+          name: macos_wheels
           path: ./wheelhouse/*.whl
           if-no-files-found: error
 
@@ -151,7 +160,7 @@ jobs:
       - name: Move all package files to files/
         run: |
           mkdir files
-          mv windows_wheels/* wheels/* sdist/* files/
+          mv windows_wheels/* linux_wheels/* macos_wheels/* sdist/* files/
 
       - name: Publish on PyPI
         if: github.event.inputs.target == 'pypi' || github.event_name == 'release'

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.1.8"
+    rev: "v0.1.9"
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2023, the PyBaMM team.
+Copyright (c) 2018-2024, the PyBaMM team.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

docs/conf.py

@@ -25,7 +25,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "PyBaMM"
-copyright = "2018-2023, The PyBaMM Team"
+copyright = "2018-2024, The PyBaMM Team"
 author = "The PyBaMM Team"
 
 # The short X.Y version

pyproject.toml

@@ -245,7 +245,12 @@ testpaths = [
 ]
 console_output_style = "progress"
 xfail_strict = true
-filterwarnings = ["error"]
+filterwarnings = [
+    "error",
+    # ignore internal nbmake warnings
+    'ignore:unclosed \<socket.socket:ResourceWarning',
+    'ignore:unclosed event loop \<:ResourceWarning',
+]
 
 # Logging configuration
 log_cli = "true"