Merge branch 'main' into auto-dependency-upgrades

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: '^docs/conf.py'
+exclude: "^docs/conf.py"
 
 default_stages: [commit]
 
@@ -12,7 +12,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.292
+    rev: v0.1.13
     hooks:
       - id: ruff
         args: [--fix, --ignore, "D,E501", "--show-fixes"]
@@ -41,7 +41,6 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v4.0.0-alpha.8
     hooks:
-    -   id: prettier
-
+      - id: prettier

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- `Solution.__add_`: Bugfix in the addition operation `+` that could cause problems with
+  child classes (i.e., classes that inherit from `Solution`) to work improperly
+
 ### Changed
 
 - Removed deprecated `pkg_resources` import in favor of `importlib.resources`

pyproject.toml

@@ -10,11 +10,13 @@ version_scheme = "no-guess-dev"
 [tool.black]
 line-length = 120
 
-[tool.ruff.lint]
-target-version = "py38"
+[tool.ruff]
+target-version = "py39"
 line-length = 120
 exclude = [".dat"]
 src = ["src"]
+
+[tool.ruff.lint]
 select = [
   "B",    # flake8-bugbear
   "C4",   # flake8-comprehensions

src/pyEQL/solution.py

@@ -10,8 +10,8 @@
 import math
 import os
 import warnings
-from importlib.resources import files
 from functools import lru_cache
+from importlib.resources import files
 from pathlib import Path
 from typing import Any, Literal
 
@@ -153,7 +153,7 @@ def __init__(
         if database is None:
             # load the default database, which is a JSONStore
             db_store = IonDB
-        elif isinstance(database, (str, Path)):
+        elif isinstance(database, str | Path):
             db_store = JSONStore(str(database), key="formula")
             logger.info(f"Created maggma JSONStore from .json file {database}")
         else: