Skip to content

Rename devel to dev#13349

Merged
drammock merged 3 commits into
mne-tools:mainfrom
cbrnr:dev-devel
Jul 25, 2025
Merged

Rename devel to dev#13349
drammock merged 3 commits into
mne-tools:mainfrom
cbrnr:dev-devel

Conversation

@cbrnr
Copy link
Copy Markdown
Contributor

@cbrnr cbrnr commented Jul 24, 2025

Fixes #13348.

@cbrnr
Copy link
Copy Markdown
Contributor Author

cbrnr commented Jul 24, 2025

Massive diff for such a tiny change, let's see if this works.

@cbrnr
Copy link
Copy Markdown
Contributor Author

cbrnr commented Jul 24, 2025

Docs are failing due to pyvista, maybe because it is using 0.46.dev0? Is this intentional?

https://app.circleci.com/pipelines/github/mne-tools/mne-python/28154/workflows/f10f86ed-1322-4053-806d-eea7b2ccaa52/jobs/74672

The pip pre check is also failing because it tries to check out a non-existing branch feat/no_new_attributes_mixin.

Comment thread doc/_static/versions.json
[
{
"name": "1.11 (devel)",
"name": "1.11 (dev)",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-1 on changing the changelog folder name. It's not user-facing. This change is the only one I expected you to make.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, but why not be consistent even for devs? Do you expect any problems if we change it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't foresee specific problems, but that doesn't guarantee there won't be any. To me, the effort & risk of unforeseen problems far outweigh the gain here. If you insist on changing the foldername, then we (you) should also do a .git-blame-ignore-revs entry for that change (which, ideally, means separating it from the change to the versions.json file).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As @larsoner noted, I've reverted changes to the history files in doc/sphinxext/prs, so now I think the remaining changes are small and also should not require a .git-blame-ignore-revs entry.

Comment thread doc/sphinxext/prs/11234.json Outdated
Copy link
Copy Markdown
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Not sure if the devel/->dev/ will cause conflicts with existing PRs, hopefully not! But easy enough to git mv if needed

@drammock feel free to merge if you're happy now

@larsoner
Copy link
Copy Markdown
Member

Failure looks like an unrelated pyvistaqt issue

@larsoner
Copy link
Copy Markdown
Member

Failure is real

checking consistency... /home/circleci/project/doc/changes/devel/13112.bugfix.rst: WARNING: document isn't included in any toctree [toc.not_included]

it needs a git mv after merging main into this branch

@cbrnr
Copy link
Copy Markdown
Contributor Author

cbrnr commented Jul 25, 2025

Test Ultraslow_PG errors are unrelated I think.

@drammock drammock merged commit 167872b into mne-tools:main Jul 25, 2025
40 checks passed
@cbrnr cbrnr deleted the dev-devel branch July 25, 2025 15:51
WouterKroot pushed a commit to WouterKroot/mne-python that referenced this pull request Aug 13, 2025
zEdS15B3GCwq pushed a commit to zEdS15B3GCwq/mne-python that referenced this pull request Aug 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Use "dev" instead of "devel" on website

3 participants