Skip to content

Commit

Permalink
Merge branch 'main' into bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
rkingsbury authored Aug 10, 2024
2 parents e4e1880 + 2c60f12 commit a79c8eb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/post-process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,32 @@ jobs:
strategy:
max-parallel: 6
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
version:
- { python: "3.9", resolution: highest, extras: testing }
- { python: "3.10", resolution: lowest-direct, extras: testing }
- { python: "3.11", resolution: highest, extras: testing }
- { python: "3.12", resolution: lowest-direct, extras: testing }
os:
- ubuntu-latest
- macos-latest
- windows-latest
- macos-14
exclude:
- os: macos-14
python-version: "3.9"
- {version: {
python: "3.9" },
os: macos-14 }
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}${{ matrix.dev }}
python-version: ${{ matrix.version.python }}
- name: Install test requirements
run: |
python -m pip install --upgrade pip
pip install -e ".[testing]"
pip install uv
uv pip install '.[${{ matrix.version.extras }}]' --system --resolution=${{ matrix.version.resolution }}
- name: Run tests
run: |
pytest -n auto --cov=src/pyEQL --cov-report=xml
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
"numpy<2",
"scipy>1.10",
"pymatgen==2024.5.1",
"iapws",
"iapws>=1.0.1",
"monty>=2024.7.12",
"maggma>=0.67.0",
"phreeqpython",
Expand Down
2 changes: 1 addition & 1 deletion src/pyEQL/solution.py
Original file line number Diff line number Diff line change
Expand Up @@ -2295,7 +2295,7 @@ def _adjust_charge_balance(self, atol=1e-8) -> None:
return

self.logger.info(
f"Solution is not electroneutral (C.B. = {cb} eq/L). Adjusting {self._cb_species} to compensate."
f"Adjusting {self._cb_species} to compensate."
)

if self.balance_charge == "pH":
Expand Down

0 comments on commit a79c8eb

Please sign in to comment.