Skip to content

[core] Update version files and clean up APIs marked for removal.#22023

Open
hageboeck wants to merge 7 commits intoroot-project:masterfrom
hageboeck:deprecation_macros_6.40
Open

[core] Update version files and clean up APIs marked for removal.#22023
hageboeck wants to merge 7 commits intoroot-project:masterfrom
hageboeck:deprecation_macros_6.40

Conversation

@hageboeck
Copy link
Copy Markdown
Member

@hageboeck hageboeck commented Apr 23, 2026

  • Update version files to 6.41.01
  • This makes the 6.40 deprecation/removal macro unnecessary, so remove it
  • Remove interfaces marked for removal in v6.42
  • Silence the removal warnings for authenticated sockets.

The removal of authenticated sockets is a bit more time intensive, so it will be performed over the coming days by @jblomer.
In order to be able to increment the version number now, the v6.42 deprecation macro has been altered to trigger only after v6.41.01. This ensures that the authenticated sockets are removed before the next branch point.

@hageboeck hageboeck self-assigned this Apr 23, 2026
@hageboeck hageboeck added the clean build Ask CI to do non-incremental build on PR label Apr 23, 2026
@hageboeck hageboeck force-pushed the deprecation_macros_6.40 branch from f074549 to 63582a5 Compare April 23, 2026 09:34
@hageboeck hageboeck changed the title [core] Update version files and clean up deprecation macros. [core] Update version files and clean up APIs marked for removal. Apr 23, 2026
@github-actions
Copy link
Copy Markdown

Test Results

    21 files      21 suites   3d 7h 6m 19s ⏱️
 3 846 tests  3 690 ✅   1 💤   155 ❌
72 199 runs  68 864 ✅ 573 💤 2 762 ❌

For more details on these failures, see this check.

Results for commit 63582a5.


/* USE AS `R__DEPRECATED(6,40, "Not threadsafe; use TFoo::Bar().")`
To be removed by 6.40 */
#if ROOT_VERSION_CODE <= ROOT_VERSION(6, 39, 0)
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.

Maybe add 6.45 deprecation macro to keep the on-going number to 3.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We might not make it to v6.46, so adding such a macro might not be useful at the moment.

@hageboeck hageboeck marked this pull request as draft April 24, 2026 18:34
@hageboeck hageboeck force-pushed the deprecation_macros_6.40 branch from 63582a5 to 1cbab5a Compare April 27, 2026 12:50
Honour the request on the users workshop to keep deprecated interfaces
around for longer.
@hageboeck hageboeck force-pushed the deprecation_macros_6.40 branch from 1cbab5a to 245600b Compare April 27, 2026 13:36
These were marked for removal in v6.42
These were marked for removal in v6.42
The removal of authenticated sockets is a non-trivial operation. To
allow for incrementing ROOT's version number now, the deprecation macro
will only trigger when exceeding version 6.42.01.
This ensures that the interface is removed before branching.

Furthermore, remove unused macros from past versions.
@hageboeck hageboeck marked this pull request as ready for review April 27, 2026 14:57
@hageboeck hageboeck force-pushed the deprecation_macros_6.40 branch from 245600b to 3f75aeb Compare April 27, 2026 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clean build Ask CI to do non-incremental build on PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants