Merge main into develop: catch up v3.0.1 hotfix - #23
Merged
Merged
Conversation
Release v3.0.0: merge develop into main
Match setup.py and Sphinx docs to the 3.0.1 debug-log string set in the vosi-tables-shortcut fix. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix vosi tables shortcut
Brings the vosi-tables-shortcut fix (PR #22) and v3.0.1 version bumps from main into develop so the next develop -> main release merge doesn't revert them. # Conflicts: # TAP/tap.py # setup.py
bjfultn
added a commit
that referenced
this pull request
Sep 10, 2026
`ruff check .` has been failing on develop since PR #23 merged (2026-06-02), on a W291 trailing-whitespace hit at TAP/vositables.py:214 introduced by 9024259. The lint step runs before pytest, so the whole test matrix aborts before a single test executes. requirements-test.txt asked for `ruff>=0.1`, so CI silently tracked whatever ruff had shipped most recently; a newer ruff began flagging this line on code nobody had touched. Pin ruff==0.15.2 so rule changes arrive as a deliberate bump rather than a surprise red build. The vositables.py change is whitespace-only -- `git diff -w` is empty. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
mainintodevelopso the nextdevelop -> mainrelease merge doesn't revert it.setup.pyandSphinx/conf.pyto3.0.1(preserving develop's cleaner formatting — no unusedimport os, no trailing whitespace).connectInfokwarg to thevosiTables(...)call inTAP/tap.py:2977(preserving develop's cleanup of the unusedvositbl =assignment).1.2.1to3.0.1.Conflict resolutions
Two files had merge conflicts; both resolved to take main's substantive changes while preserving develop's ruff-cleaned formatting:
setup.py— version3.0.1from main; import shape and whitespace from develop.TAP/tap.py—connectInfo=self.config.connectInfokwarg from main; dropped the unusedvositbl =assignment per develop's lint-clean form.Sphinx/conf.pyandTAP/vositables.pymerged cleanly.Test plan
pytest tests/ -qlocally → 53 passed, 2 expected skips🤖 Generated with Claude Code