Skip to content

Release v2.6.4#6890

Merged
agoscinski merged 9 commits into
aiidateam:support/2.6.xfrom
agoscinski:release/2.6.4
May 22, 2025
Merged

Release v2.6.4#6890
agoscinski merged 9 commits into
aiidateam:support/2.6.xfrom
agoscinski:release/2.6.4

Conversation

@agoscinski
Copy link
Copy Markdown
Collaborator

@agoscinski agoscinski commented May 22, 2025

Release to mainly contain the fix #6888

I had to adapt the click fix #6888 to not end up in cherry-picking all devops changes as well as other new dependencies (like the updated disk-objetcstore since git also tracks this as a change due to the added comma). The added first the commits that have a corresponding commit on the main branch (most of them are highly adapted make them independent on other changes), then I added further changes that are completely disconnected from main just to make pre-commit, RTD, conda tests work. The fixes to the changelog do not have a corresponding commit in the main branch as we did the CHANGELOG.md there correctly.

EDIT:
Docker image build is failing but it was not working for any 2.6.x release and now 2-4 weeks before the release of v2.7.0 is not worth the time to fix it for this release as it is working for the next minor release and release candidate versions are already uploaded.

agoscinski and others added 2 commits May 22, 2025 08:07
`click` released v8.2 breaking the API so we to pin to`~=8.1.0`

Cherry-pick: e1d55fa

Since most of the uv infrastructure has not been part of previous
releases, the fix has been reapplied rather than cherry-picking
the commit with all other commits it depends on.
`click` released v8.2.0 and by that broke the references to their doc. We pinned
`click~=8.1` so we still need to reference the old API but because `click` only
keeps one version of the documentation, we cannot reference a different API.
Thus we reference the functions by the GitHub link for v8.1.0.

Cherry-pick: 5168032
@agoscinski agoscinski force-pushed the release/2.6.4 branch 5 times, most recently from 1a8cc88 to 0034e94 Compare May 22, 2025 07:17
@codecov
Copy link
Copy Markdown

codecov Bot commented May 22, 2025

Codecov Report

Attention: Patch coverage is 33.33333% with 4 lines in your changes missing coverage. Please review.

Project coverage is 77.79%. Comparing base (b78c21f) to head (564067e).
Report is 1 commits behind head on support/2.6.x.

Files with missing lines Patch % Lines
src/aiida/cmdline/commands/cmd_devel.py 0.00% 4 Missing ⚠️
Additional details and impacted files
@@                Coverage Diff                @@
##           support/2.6.x    #6890      +/-   ##
=================================================
- Coverage          77.80%   77.79%   -0.00%     
=================================================
  Files                562      562              
  Lines              41846    41849       +3     
=================================================
  Hits               32554    32554              
- Misses              9292     9295       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@agoscinski agoscinski marked this pull request as ready for review May 22, 2025 12:01
@agoscinski agoscinski requested review from danielhollas and unkcpz and removed request for danielhollas May 22, 2025 12:01
Copy link
Copy Markdown
Collaborator

@danielhollas danielhollas left a comment

Choose a reason for hiding this comment

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

Ugh, this looks painful thanks for doing this!

Comment thread CHANGELOG.md Outdated

### Fixes
- Dependencies: Pin click to `~=8.1.0` (#6888) [[e1d55fa]](https://github.com/aiidateam/aiida-core/commit/e1d55fa0d6c268db7a25e9740679a5a0fbe412b8)
- Fixing doc references after `click` 8.2 release (#6880) [[5168032]](https://github.com/aiidateam/aiida-core/commit/5168032b810aef94ca91c91859e53e1752c72273)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- Fixing doc references after `click` 8.2 release (#6880) [[5168032]](https://github.com/aiidateam/aiida-core/commit/5168032b810aef94ca91c91859e53e1752c72273)

Let's remove this, it's irrelevant to the readers of the changelog and does not touch code.

danielhollas and others added 6 commits May 22, 2025 14:16
…iidateam#6693)

`verdi devel check-undesired-imports` makes sure that we don't have heavy imports during verdi startup to keep the CLI snappy (especially for tab completion).

One of the expensive modules that it checks is `asyncio`. Unfortunately, when you install the tui extra, the trogon package that powers the tui functionality seems to use asyncio, and this makes the test fail.
(indeed, one of the TUIs current downsides is that it makes all CLI interactions slower, even if you don't use the TUI subcommand).

The PR makes the test more clever and don't check for `asyncio` import when `tui` extras is installed.

Cherry-pick: 8039ad9

some uv changes have been removed
Adding BaseModel to nitpick-exceptions.

Cherry-pick: 958bfd0

Only picks up the RTD changes from the commit.
The version specifier `~=2.7,>=2.7.2` become invalid in mamba and
results in the error

```
libmambapy.bindings.specs.ParseError: Error parsing version "'>=2.7.2". Version
contains invalid characters in '>=2.7.2.
```

This is fixed by using the equivalent specifier `<3.0.0,>=2.7.2`
The links of the commit hashes have been fixed and the TODO has been resolved.
The readthedocs needs to specify the configuration location. This is a
simplified fix of commit 15b5caf in the main branch. That cannot
cherry-picked since it would require an uv update.
@agoscinski
Copy link
Copy Markdown
Collaborator Author

Docker image build is failing but it was not working for any 2.6.x release and now 2-4 weeks before the release of v2.7.0 is not worth the time to fix it for this release as it is working for the next minor release and release candidate versions are already uploaded.

@agoscinski agoscinski force-pushed the release/2.6.4 branch 4 times, most recently from 2d79a14 to 564067e Compare May 22, 2025 14:44
@agoscinski
Copy link
Copy Markdown
Collaborator Author

I did a testrun of the release workflow and it worked https://github.com/agoscinski/aiida-core/actions/runs/15189282862/job/42717934704 merging now if CI passes (except codecov and docker)

@agoscinski agoscinski merged commit b7f20c3 into aiidateam:support/2.6.x May 22, 2025
53 of 56 checks passed
@agoscinski agoscinski deleted the release/2.6.4 branch May 22, 2025 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants