Repository navigation
Conversation
The version lived in setup.py and was parsed back out of it with a regex at runtime; the release history lived in the README; a release was a bump commit and a tag, with nothing checking that the two agreed; and the test tooling arrived as a side effect of installing mcrit, which stopped being true in MCRIT 1.8.0. Packaging metadata moves to pyproject.toml (PEP 621), which is now the only place the version is declared - the running version is read from it, falling back to the installed metadata. ruff.toml and pytest.ini fold into the same file; requirements.txt stays for deployments installing from a checkout, and a test keeps it identical to the declared dependencies. The release history moves into CHANGELOG.md unchanged, with a Keep a Changelog section above it. Pushing a vX.Y.Z tag now refuses to continue unless the tag matches the declared version, the version has a changelog section, the commit is on master and CI passed on it; then builds the sdist and wheel, installs the wheel into a clean environment to prove the templates, static assets and schema ship, and creates the GitHub release from the changelog section with the artifacts attached. Nothing is published to PyPI. A PR that changes mcritweb/ or pyproject.toml has to touch CHANGELOG.md or carry the no-changelog label. CI pins its actions to commit SHAs and runs on Python 3.12 to 3.14; the Python floor moves to 3.12, shared across the MCRIT ecosystem.
|
Carry the concurrency-group fix into this port before it merges. This PR adds: concurrency:
group: release-${{ github.ref }}
cancel-in-progress: falseA rehearsal ( The fix is one line: group: release-${{ github.ref }}-${{ github.event_name }}Two real publishes of one tag are both Fixed upstream in smda danielplohmann/smda#353 and purepdb danielplohmann/purepdb#67. Flagging here so this port does not inherit the shape and need the same fix afterwards. |
|
Reviewed against
|
this PR, pyproject.toml |
requires-python = ">=3.12" |
master, setup.py |
python_requires=">=3.11" |
mcrit (the dependency) |
requires-python = ">=3.11" |
The 3.11 floor on master is deliberate and documented in the comment above it — it is inherited from mcrit's own floor, not from anything in mcritweb's source. I could not find anything in this PR's diff that requires 3.12, so as written this drops 3.11 support without an accompanying reason.
CI goes from four Python versions to one
master's matrix is ["3.11", "3.12", "3.13", "3.14"]; this PR runs python-version: "3.12" alone. Combined with the above, 3.11 would be both undeclared and untested — and 3.13/3.14 would stop being tested too, which is a separate loss.
Why this is easy to miss in review
This PR deletes setup.py, and master modifies it. That is a delete/modify conflict: git flags the path but shows no conflict markers, so "keep the deletion" is the natural resolution and the python_requires=">=3.11" line disappears silently along with the file. Tested locally — merging in either direction conflicts on the same six paths:
setup.py mcritweb/__init__.py Makefile .github/workflows/test.yml AGENTS.md README.md
The other five are small (one hunk each; mcritweb/__init__.py is an import line where get_mcritweb_version_from_setup was renamed and get_minhash_matching_label was added alongside it — both sides wanted).
Suggestion
Carry requires-python = ">=3.12" → ">=3.11" and restore the four-version matrix in this PR, unless 3.12 is intended — in which case it is worth saying so in the description, since it drops a supported version rather than reorganising packaging.
Not a blocker on the release-on-a-tag mechanism, which is the actual point of the PR.
🤖 Generated with Claude Code
1.5.0 was released after this branch was written, so master's release has to be carried into the places this branch moves things to, rather than merged line by line: - setup.py stays deleted; pyproject.toml takes its 1.5.0 version, and CHANGELOG.md gains a `## [1.5.0] - 2026-09-21` section with the release text as it was published in the README - the heading the release guard looks for, so the declared version has its section. - README drops the version history for the CHANGELOG pointer, and keeps master's reverse-proxy section. - `make init` and CI install `.[dev]`; the dev extra now pins pytest and pytest-cov as well as ruff, the versions master's CI pinned. One decision this branch made is not kept: raising the floor to Python 3.12. Master (familiary#166) declared >=3.11 in 1.5.0 on purpose - inherited from mcrit, whose own floor is still >=3.11 on main and in v1.9.0, so the "shared across the MCRIT ecosystem" rationale does not hold yet. The floor stays >=3.11 in pyproject.toml (with familiary#166's reasoning), ruff targets py311, CI runs 3.11-3.14 again, and the [Unreleased] entry that announced the removal is gone. Moving to 3.12 is its own decision. Where git merged cleanly and got it wrong: - utility.py lost `import re`: this branch dropped it with the regex version parsing, and master's QUERY_UPLOAD_JOB_ID (familiary#169) needs it. The module did not import - ruff's F821 caught it. - tests/testPythonFloor.py (master) read setup.py and ruff.toml; it now reads pyproject.toml, where both live. Comments and messages in data.py, testSubmitMetadata.py and testNoStrayPrints.py that pointed at setup.py for the mcrit pin point at pyproject.toml. 998 passed, ruff clean. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011EAW1DRkBwmjZtGzQ5pgDA
Every branch the familiary session should push now sits on the fork, one commit on master e4bfa55, with its PR text beside it here: familiary#183, familiary#188, familiary#193, familiary#199, familiary#200, familiary#206, familiary#207 and the export fix. familiary#193, familiary#199, familiary#206 and familiary#207 differ from the patches on the status page after an adversarial review; section 13 says how. Also records the merge conflicts between open PRs that a reviewer will meet (the changelog lines and familiary#176, familiary#160's palette, familiary#130, familiary#145), and corrects the ripgrep sample's size everywhere: 11,598 functions, not 8.5k.
|
Decision: MCRITweb adopts this release process, before 1.7.0, and 1.7.0 will be the test drive: the first release cut by pushing a tag. Could you bring the branch up to date? Please do it once batch C has landed (#298, then #299), since both touch the same files. A few things to carry over, because master has moved since 09-23:
Today it conflicts in 🤖 Generated with Claude Code |
setup.py is deleted here and changed on master, a conflict without markers, so pyproject.toml takes master's values rather than the branch's: version 1.6.0, requires-python >=3.12, mcrit>=1.12.0, ruff target py312, and no 3.11 classifier. ruff.toml goes the same way into [tool.ruff]. master's admin pages read the version from MCRITWEB_VERSION, which create_app fills once; that is kept, and create_app now fills it from get_mcritweb_version(). testMcritFloor (familiary#212) reads pyproject.toml, and the manual's traversal test asks for a file that still exists. README's 1.6.0 entry moves into CHANGELOG.md as its own section, as 1.5.0 did, and the compare links at the foot point at the current tags.
The workflow runs only on a pushed tag today, so this changes nothing yet. It keeps the group the same as in smda (#353) and purepdb (#67): there, a rehearsal started by hand on a tag shared github.ref with the tag's push run, and with cancel-in-progress off it queued behind it and never started. Two pushes of one tag still share a group and run one after the other.
…alues AGENTS.md's Versioning & releases now says where the version lives and how it reaches the server page, when a PR needs a changelog entry and what the no-changelog label and changelog.yml do, and that pushing the tag is the release. The ruff and pytest settings are pointed at pyproject.toml, where they moved. RELEASING.md gets a table of what differs from the other MCRIT repositories (one version location, no package index, the CI workflow the gate reads, no milestones, Python 3.12 to 3.14, mcrit>=1.12.0) and a short section on the Python floor. The sentence about a tag having to match "every one of them" came from a repository with several version locations; here there is one.
The entries for familiary#298 and familiary#299, from their change lists and their notes for deployment, and familiary#212's entry, which was held back for this. familiary#212's floor change is not repeated: master's mcrit>=1.12.0 was already in 1.6.0. Fixes made during the two integrations to code that had not been released are left out.
…ipping The suite runs from a checkout, never from an installed wheel, so a missing pyproject.toml or release_guard.py means one was moved, and a skip would pass over it. Also drops the trailing spaces three README history entries carried into CHANGELOG.md.
|
Thanks. Master (6564602, with both batches) is merged in (1495dac), and the rest is in 187ade7, 0b8bd9e and a091051. 65053e0 makes the packaging and guard tests assert that they run from a source tree instead of skipping when they don't.
|
master's three unreleased README entries move into CHANGELOG.md's Unreleased section, text unchanged: the WAL change under Changed, the atomic secret key under Fixed, and the jQuery UI update under a new Security heading. The WAL entry's "above" now names README.md, where the "SQLite database" section stays.
|
Master (fe6b313) is merged in, in 9706f84. This PR replaces README's Version History with a link to CHANGELOG.md, so master's three new
502 tests pass across the changed and related modules. |
On master the version lives in
setup.pyand is read back out of it with a regex at runtime, the release history is a list in the README, and a release is a version bump and a tag with nothing checking that the two agree. This makespyproject.tomlthe one place the version is declared, moves the history intoCHANGELOG.md, and makes pushing avX.Y.Ztag the release: a workflow checks the tag against the version and the changelog, builds and installs the wheel, and creates the GitHub release from the changelog section.It is one of the pull requests giving the MCRIT ecosystem one release process: the same guard script, the same tag-triggered workflow, the same changelog check, and a
RELEASING.mdin each repository that states only the values that differ.Change.
Packaging.
pyproject.toml(PEP 621) replacessetup.py,ruff.tomlandpytest.ini.requires-python = ">=3.12"(pyproject.toml:14),mcrit>=1.12.0(pyproject.toml:46), rufftarget-version = "py312"(pyproject.toml:82), and classifiers from 3.12 to 3.14. The dependency list is master'srequirements.txt, which also carriesrequestsandclick, whichsetup.pylacked.get_mcritweb_version()(mcritweb/views/utility.py:457) reads the version from the checkout'spyproject.tomlwithtomllib, and falls back to the installed metadata for a wheel.create_appstores it inMCRITWEB_VERSIONonce (mcritweb/__init__.py:271), and the server page shows that value, as on master (mcritweb/views/administration.py:271,:297).requirements.txtstays, becausedocker-mcritinstalls from it against a tagged checkout.tests/testPackaging.pyfails if it differs from[project].dependencies, andtests/testMcritFloor.py(Add admin controls for the three corpus repair jobs #212) now compares the mcrit floor ofpyproject.tomlandrequirements.txt.devextra carries the pinnedpytest,pytest-covandruff; CI andmake initinstall-e ".[dev]".templates/**,static/**,sql/*.sql) is declared, so a wheel is complete. MCRITweb is still deployed from a checkout and published nowhere: the release workflow builds and installs the wheel only to prove the package is complete, and attaches it to the release.Changelog.
CHANGELOG.md: 1.6.0 and 1.5.0 as sections of their own, the older entries under## Older releases, all as they were written. The README links to it.## [Unreleased]already lists batch C (Integrate batch C1 (UI): #117 #119 #122 #136 #172 #173 #219 #244, with #297 #298, Integrate batch C2 (UI): #132 #147 #148 #214 #159 #213 #226 #145 #229 #142 #115 #174 #212 (stacked on #298) #299) and Add admin controls for the three corpus repair jobs #212, with their notes for deployment, so the 1.7.0 section is ready when the tag goes out.mcritweb/orpyproject.tomlhas to touchCHANGELOG.mdor carry theno-changeloglabel..github/workflows/changelog.ymlchecks it, with a read-only token and without checking out the PR.What pushing
vX.Y.Zdoes (.github/workflows/release.yml):pyproject.toml,CHANGELOG.mdhas a## [X.Y.Z] - <date>section (written out as the notes), the commit is onmaster, and theCIworkflow (test.yml) passed on that commitpython -m buildandtwine check --strict, then installs the wheel into a clean venv and checks that the version,templates/base.html,static/css/all.cssandsql/create_table_server.sqlarrivedgh release createwith the changelog section as the body and--generate-notesappended, sdist and wheel attached; a pre-release tag is marked--prereleaseand not made latestThe concurrency group is
release-${{ github.ref }}-${{ github.event_name }}(.github/workflows/release.yml:15), as in smda#353 and purepdb#67.CI.
test.ymlpinsactions/checkoutandactions/setup-pythonto commit SHAs withpersist-credentials: false, runs on Python 3.12 to 3.14 as on master, and installs the dev extra.dependabot.ymlkeeps the action pins current weekly and watches pip monthly.Docs. AGENTS.md's "Versioning & releases" describes
pyproject.toml,CHANGELOG.md, theno-changeloglabel and the tag-triggered workflow.RELEASING.mddescribes the process and has a table of the values that differ for MCRITweb: one version location, no package index, the CI workflow the gate reads, no milestones, Python 3.12 to 3.14,mcrit>=1.12.0.Verification.
release_guard.py --tag v1.6.0on this tree passes and writes out the 1.6.0 section;--tag v1.7.0is refused: "tag v1.7.0 does not match the packaged version (pyproject.toml = 1.6.0)".mcritweb-1.6.0-py3-none-any.whl. Its metadata readsRequires-Python: >=3.12andRequires-Dist: mcrit>=1.12.0, and it holds the three files the build job checks.actionlintis clean, andzizmor --persona=regularreports no findings.Tests.
tests/testPackaging.pykeepsrequirements.txtand the running version equal topyproject.toml.tests/testReleaseGuard.pycovers the guard script.tests/testPythonFloor.pyandtests/testMcritFloor.pyread the floors frompyproject.toml. Full suite with Chromium on 65053e0: 2092 passed, 11 skipped, none of them in a file this branch changes;ruff check .clean. Of the tests in the changed files, 16 fail on master's code and two cannot import there (they readget_mcritweb_version); the rest are guards that pass on master too.What a maintainer configures once. The
no-changeloglabel. There is no index and no secret.Compatibility.
pip install -r requirements.txtkeeps working.pip install -e .is equivalent, andpip install -e ".[dev]"adds the tooling.docker-mcritis unaffected until it chooses to build frompyproject.toml.Related pull requests across the ecosystem. The same process, one PR per repository. None depends on another to merge. Once merged, the release order is smda, purepdb, picblocks, MCRIT, MCRITweb, docker-mcrit.