Skip to content

Commit

Permalink
Merge branch 'master' into tian/snow
Browse files Browse the repository at this point in the history
  • Loading branch information
gantian127 committed Jan 6, 2024
2 parents ce6a7ef + 0325e2e commit bb3ef02
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repos:
language: pygrep

- repo: https://github.com/psf/black
rev: 23.11.0
rev: 23.12.0
hooks:
- id: black
name: black
Expand Down Expand Up @@ -52,7 +52,7 @@ repos:
- flake8-simplify

- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.0
rev: 1.7.1
hooks:
- id: nbqa-pyupgrade
args: ["--py310-plus"]
Expand All @@ -78,7 +78,7 @@ repos:
args: [--py310-plus]

- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
name: isort (python)
Expand Down
3 changes: 3 additions & 0 deletions news/1850.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

Fixed an issue that caused with the CI to fail when building *multidict* on
Mac and Python 3.12.
11 changes: 10 additions & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
import os
import pathlib
import shutil
import sys

import nox
from packaging.requirements import Requirement

PROJECT = "landlab"
ROOT = pathlib.Path(__file__).parent
PYTHON_VERSION = "3.11"
PYTHON_VERSION = "3.12"
PATH = {
"build": ROOT / "build",
"docs": ROOT / "docs",
Expand All @@ -25,6 +26,10 @@ def test(session: nox.Session) -> None:

session.log(f"CC = {os.environ.get('CC', 'NOT FOUND')}")

if sys.platform.startswith("darwin") and session.python == "3.12":
session.log("installing multidict from conda-forge.")
session.conda_install("multidict")

session.install(
"-r",
PATH["requirements"] / "required.txt",
Expand Down Expand Up @@ -70,6 +75,10 @@ def test_notebooks(session: nox.Session) -> None:

os.environ["WITH_OPENMP"] = "1"

if sys.platform.startswith("darwin") and session.python == "3.12":
session.log("installing multidict from conda-forge")
session.conda_install("multidict")

session.install(
"-r",
PATH["requirements"] / "required.txt",
Expand Down

0 comments on commit bb3ef02

Please sign in to comment.