Skip to content

Commit 4f09a83

Browse files
authored
Support Python 3.10 TOML loading (#626)
1 parent 9235bac commit 4f09a83

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tools/release/publish_zenodo.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
import mimetypes
77
import os
88
import sys
9-
import tomllib
109
from pathlib import Path
1110
from urllib import error, parse, request
1211

12+
try:
13+
import tomllib
14+
except ModuleNotFoundError: # pragma: no cover
15+
import tomli as tomllib
16+
1317
try:
1418
import yaml
1519
except ImportError as exc: # pragma: no cover - exercised in release workflow

ultraplot/tests/test_release_metadata.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import importlib.util
44
import re
55
import subprocess
6-
import tomllib
76
from pathlib import Path
87

98
import pytest
@@ -87,8 +86,7 @@ def test_zenodo_release_metadata_is_built_from_repository_sources():
8786
"""
8887
publish_zenodo = _load_publish_zenodo()
8988
citation = yaml.safe_load(CITATION_CFF.read_text(encoding="utf-8"))
90-
with PYPROJECT.open("rb") as handle:
91-
pyproject = tomllib.load(handle)
89+
pyproject = publish_zenodo.load_pyproject(PYPROJECT)
9290
metadata = publish_zenodo.build_metadata(citation, pyproject)
9391
assert metadata["title"] == citation["title"]
9492
assert metadata["upload_type"] == "software"

0 commit comments

Comments
 (0)