From 967e7bb14c8a858939707f43bec131f0e4cc587a Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 25 Jun 2025 09:57:56 -0700 Subject: [PATCH 1/3] Use static YAMLSpecWriter.sort_keys --- hdmf_docutils/doctools/rst.py | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hdmf_docutils/doctools/rst.py b/hdmf_docutils/doctools/rst.py index 188adf3..48f7106 100644 --- a/hdmf_docutils/doctools/rst.py +++ b/hdmf_docutils/doctools/rst.py @@ -294,9 +294,9 @@ def spec_to_yaml(spec): # Convert to plain dict first clean_spec = json.loads(json.dumps(spec, indent=4, separators=(',', ': '))) + # Sort keys using YAMLSpecWriter's sort_keys method - hdmf_yaml_writer = YAMLSpecWriter() - sorted_spec = hdmf_yaml_writer.sort_keys(clean_spec) + sorted_spec = YAMLSpecWriter.sort_keys(clean_spec) yaml = YAML(pure=True) yaml.default_flow_style = False diff --git a/pyproject.toml b/pyproject.toml index 61091c4..c517641 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ keywords = [ dependencies = [ "matplotlib", "networkx", - "hdmf", + "hdmf>=4.1.0", "pillow", "sphinx", "sphinx-gallery", From 0cca28f2aee4c0f60b9d3bcc9f600b8564930b69 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 25 Jun 2025 10:02:03 -0700 Subject: [PATCH 2/3] Remove _version from source control --- hdmf_docutils/_version.py | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 hdmf_docutils/_version.py diff --git a/hdmf_docutils/_version.py b/hdmf_docutils/_version.py deleted file mode 100644 index ef71137..0000000 --- a/hdmf_docutils/_version.py +++ /dev/null @@ -1,16 +0,0 @@ -# file generated by setuptools_scm -# don't change, don't track in version control -TYPE_CHECKING = False -if TYPE_CHECKING: - from typing import Tuple, Union - VERSION_TUPLE = Tuple[Union[int, str], ...] -else: - VERSION_TUPLE = object - -version: str -__version__: str -__version_tuple__: VERSION_TUPLE -version_tuple: VERSION_TUPLE - -__version__ = version = '0.4.8.dev6+ga5f1c9d.d20250208' -__version_tuple__ = version_tuple = (0, 4, 8, 'dev6', 'ga5f1c9d.d20250208') From e8e70b399fe68d0349abaaa9bb5e6d43901bd59e Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 25 Jun 2025 10:02:17 -0700 Subject: [PATCH 3/3] Add _version.py to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 792ac30..d09f3ee 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ docs/_build # Add Hatch .hatch/ .venv/ + +# Hatch-vcs +_version.py \ No newline at end of file