1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538
|
========
Concepts
========
This page contains conceptual info about how Releases organizes and thinks
about issues and releases. For details on formatting/config options/etc (e.g.
so you can interpret the examples below), see :doc:`/usage`.
Issue and release types
=======================
* Issues are always one of three types: **features**, **bug fixes** or
**support items**.
* **Features** are (typically larger) changes adding new behavior.
* **Bug fixes** are (typically minor) changes addressing incorrect
behavior, crashes, etc.
* **Support items** vary in size but are usually non-code-related changes,
such as documentation or packaging updates.
* Releases also happen to come in three flavors:
* **Major releases** are backwards incompatible releases, often with
large/sweeping changes to a codebase.
* They increment the first version number only, e.g. ``1.0.0``.
* **Feature releases** (sometimes called **minor** or **secondary**) are
backwards compatible with the previous major release, and focus on adding
new functionality (code, or support, or both.) They sometimes include
major/complex bug fixes which are too risky to include in a bugfix
release.
* The second version number is incremented for these, e.g. ``1.1.0``.
* **Bugfix releases** (sometimes called **tertiary**) focus on fixing
incorrect behavior while minimizing the risk of creating more bugs.
Rarely, they will include small new features deemed important enough to
backport from their 'native' feature release.
* These releases increment the third/final version number, e.g.
``1.1.1``.
Release organization
====================
We parse changelog timelines so the resulting per-release issue lists honor the
above descriptions. Here are the core rules, with examples. See :doc:`/usage`
for details on formatting/etc.
* **By default, bugfixes go into bugfix releases, features and support items go
into feature releases.**
* Input::
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :support:`4` Updated our test runner
* :bug:`3` Another bugfix
* :feature:`2` Implemented new feature
* :bug:`1` Fixed a bug
* :release:`1.0.0 <date>`
* Result:
* ``1.1.0``: feature #2, support #4
* ``1.0.1``: bug #1, bug #3
* **Bugfixes are assumed to backport to all stable release lines by default,
and are displayed as such.** However, this can be overridden on a per-release
and/or per-bug basis - see later bullet points.
* Input::
* :release:`1.1.1 <date>`
* :release:`1.0.2 <date>`
* :bug:`3` Fixed another bug, onoes
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :feature:`2` Implemented new feature
* :bug:`1` Fixed a bug
* :release:`1.0.0 <date>`
* Result:
* ``1.1.1``: bug #3
* ``1.0.2``: bug #3
* ``1.1.0``: feature #2
* ``1.0.1``: bug #1
* **Bugfixes marked 'major' go into feature releases instead.** In other words,
they're displayed as bugs, but organized as features.
* Input::
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :bug:`3 major` Big bugfix with lots of changes
* :feature:`2` Implemented new feature
* :bug:`1` Fixed a bug
* :release:`1.0.0 <date>`
* Result:
* ``1.1.0``: feature #2, bug #3
* ``1.0.1``: bug #1
* **Features or support items marked 'backported' appear in both bugfix and
feature releases.** In other words, they're displayed as feature/support
items, but organized as a combination feature/support *and* bug item.
* Input::
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :bug:`4` Fixed another bug
* :feature:`3` Regular feature
* :feature:`2 backported` Small new feature worth backporting
* :bug:`1` Fixed a bug
* :release:`1.0.0 <date>`
* Result:
* ``1.1.0``: feature #2, feature #3
* ``1.0.1``: bug #1, feature #2, bug #4
* **Releases implicitly include all issues from their own, and prior, release
lines.** (Again, unless the release explicitly states otherwise - see below.)
* For example, in the below changelog (remembering that changelogs are
written in descending order from newest to oldest entry) the code
released as ``1.1.0`` includes the changes from bugs #1 and #3, in
addition to its explicitly stated contents of feature #2::
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :bug:`3` Another bugfix
* :feature:`2` Implemented new feature
* :bug:`1` Fixed a bug
* :release:`1.0.0 <date>`
* Again, to be explicit, the rendered changelog displays this breakdown:
* ``1.1.0``: feature #2
* ``1.0.1``: bug #1, bug #3
But it's *implied* that ``1.1.0`` includes the contents of ``1.0.1``
because it released afterwards/simultaneously and is a higher release
line.
* **Releases may be told explicitly which issues to include** (using a
comma-separated list.) This is useful for the rare bugfix that gets
backported beyond the actively supported release lines.
For example, below shows a project whose lifecycle is "release 1.0; release
1.1 and drop active support for 1.0; put out a special 1.0.x release."
Without the explicit issue list for 1.0.1, Releases would roll up all
bugfixes, including the two that didn't actually apply to the 1.0 line.
* Input::
* :release:`1.0.1 <date>` 1, 5
* :release:`1.1.1 <date>`
* :bug:`5` Bugfix that applied back to 1.0.
* :bug:`4` Bugfix that didn't apply to 1.0, only 1.1
* :bug:`3` Bugfix that didn't apply to 1.0, only 1.1
* :release:`1.1.0 <date>`
* :feature:`2` Implemented new feature
* :bug:`1` Fixed a 1.0.0 bug
* :release:`1.0.0 <date>`
* Result:
* ``1.1.0``: feature #2
* ``1.1.1``: bugs #3, #4 and #5
* ``1.0.1``: bugs #1 and #5 only
* **Bugfix issues may be told explicitly which release line they 'start' in.**
This is useful for bugs that don't go back all the way to the oldest actively
supported line - it keeps them from showing up in "too-old" releases.
The below example includes a project actively supporting 1.5, 1.6 and 1.7
release lines, with a couple of bugfixes that only applied to 1.6+.
* Input::
* :release:`1.7.1 <date>`
* :release:`1.6.2 <date>`
* :release:`1.5.3 <date>`
* :bug:`50` Bug applying to all lines
* :bug:`42 (1.6+)` A bug only applying to the new feature in 1.6
* :release:`1.7.0 <date>`
* :release:`1.6.1 <date>`
* :release:`1.5.2 <date>`
* :feature:`25` Another new feature
* :bug:`35` Bug that applies to all lines
* :bug:`34` Bug that applies to all lines
* :release:`1.6.0 <date>`
* :release:`1.5.1 <date>`
* :feature:`22` Some new feature
* :bug:`20` Bugfix
* :release:`1.5.0 <date>`
* Result:
* ``1.7.1``: bugs #50 and #42
* ``1.6.2``: bugs #50 and #42
* ``1.5.3``: bug #50 only
* ``1.7.0``: feature #25
* ``1.6.1``: bugs #34, #35
* ``1.5.2``: bugs #34, #35
* ``1.6.0``: feature #22
* ``1.5.1``: bug #20
* **Bugs listed before the first release are treated as though they have the
'major' keyword.** This is chiefly because it makes no sense to have a
"bugfix release" as one's first-ever release - you can't fix something that's
not public! Then once the changelog parser passes that initial release,
normal rules start to apply again.
* Input::
* :release:`0.1.1`
* :bug:`3` The feature had bugs :(
* :release:`0.1.0 <date>`
* :feature:`2` Our first ever feature
* :bug:`1` Explicitly marked bug, even though that is silly
* Implicit issue/entry here (becomes a bug by default)
* Result:
* ``0.1.1``: bug #3 only, since it's the only bug after the first
release.
* ``0.1.0``: everything else - the implicit bug, the explicit bug #1,
and the feature #2.
Major releases
==============
Major releases introduce additional concerns to changelog organization on top
of those above. Users whose software tends to just "roll forwards" without
keeping older stable branches alive for bugfix releases, will likely not need
to do much.
However, when your support window stretches across major version
boundaries, telling Releases which issues belong to which major version (or
versions plural) becomes a bit more work.
There are two main rules to keep in mind when dealing with "mixed" major
versions:
* **All issues encountered after a major release** are considered associated
with that major release line **by default**.
* **All feature-like items (features, support, major bugs) encountered just
prior to a major release** are considered part of the major release itself.
* To force association with a **different major release** (or set of major
releases), issues may **specify a 'version spec'** annotation.
Here's some examples to clarify.
"Rolling" releases
------------------
This example has no mixing of release lines, just moving from 1.x to 2.x. 1.x
is effectively abandoned. (Hope 2.x is an easy upgrade...) Note how features 4
and 5, because they are encountered prior to 2.0.0, are attached to it
automatically.
Input::
* :release:`2.1.0 <date>`
* :release:`2.0.1 <date>`
* :feature:`7` Yet another new feature
* :bug:`6` A bug :(
* :release:`2.0.0 <date>`
* :feature:`5` Another (backwards incompatible) feature!
* :feature:`4` A (backwards incompatible) feature!
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :feature:`3` New feature
* :bug:`2` Another bug
* :bug:`1` An bug
* :release:`1.0.0 <date>`
Result:
* ``2.1.0``: feature #7
* ``2.0.1``: bug #6
* ``2.0.0``: feature #4, feature #5
* ``1.1.0``: feature #3
* ``1.0.1``: bug #1, bug #2
Pretty simple, nothing actually new here.
Mostly-compatible 2.0 with continued maint for 1.x
--------------------------------------------------
This maintainer is a bit more conscientious/masochistic and wants to keep users
of 1.x happy for a while after 2.0 launches.
The timeline is very similar to the previous example, but in this scenario, all
issues developed on the 1.x branch are forward-ported to 2.x, because 2.x
wasn't a huge departure from 1.x.
To signify this, post-2.0 issues that were developed initially for 1.x, are
annotated with ``(1.0+)``, telling Releases to add them to all releases above
1.0, instead of just the most recent major release (2.0)::
* :release:`2.1.0 <date>`
* :release:`2.0.1 <date>`
* :release:`1.2.0 <date>`
* :release:`1.1.1 <date>`
* :release:`1.0.2 <date>`
* :bug:`9` A 2.0-only bugfix.
* :feature:`8` A 2.0-only feature.
* :feature:`7 (1.0+)` Yet another new feature
* :bug:`6 (1.0+)` A bug :(
* :release:`2.0.0 <date>`
* :feature:`5` Another (backwards incompatible) feature!
* :feature:`4` A (backwards incompatible) feature!
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :feature:`3` New feature
* :bug:`2` Another bug
* :bug:`1` An bug
* :release:`1.0.0 <date>`
Result:
* ``2.1.0``: feature #7, feature #8
* ``2.0.1``: bug #6, bug #9
* ``1.2.0``: feature #7, but not feature #8
* ``1.1.1``: bug #6, but not bug #9
* ``1.0.2``: bug #6, but not bug #9
* ``2.0.0``: feature #4, feature #5
* ``1.1.0``: feature #3
* ``1.0.1``: bug #1, bug #2
Some issues forward-ported, others not
--------------------------------------
This time, some issues remain 1.x-specific as they don't apply to 2.x for
whatever reason. The simple "X.Y+" format doesn't let us declare this, so we
use one you're familiar with from packaging systems like
``setuptools``/``pip``:
* ``(<2.0)`` signifies "only included in releases lower than 2.0"
* ``(>=2.0)`` says "only include in release lines 2.0 and higher" (thus
applying to 2.1, 2.2, 3.0, 4.0 etc).
* This is identical to saying ``(2.0+)``; the ``+`` version is just a
convenient / backwards compatible shorthand.
* ``(>=2.0,<3.0)`` limits an issue to *just* the 2.x line, preventing its
inclusion in 1.x, 3.x or anything else.
* And so on; see the documentation for the ``Spec`` class at
https://python-semanticversion.readthedocs.io for details.
* To be clear, **you may put any combination of major+minor version number in
these annotations**, just as with the simpler ``(1.5+)`` style format.
* This is mostly applicable to bugs or backported issues. Features, support
items and major bugs only need to inform Releases about major release
lines.
Armed with this more powerful syntax, we can limit some issues just to the 1.x
line::
* :release:`2.1.0 <date>`
* :release:`2.0.1 <date>`
* :release:`1.2.0 <date>`
* :release:`1.1.1 <date>`
* :release:`1.0.2 <date>`
* :feature:`9 (>=1.0)` A new feature that works with both versions (using
the more explicit version of "1.0+")
* :feature:`8` A new feature that only works on 2.x (no annotation needed)
* :bug:`7 (<2.0)` A bug only affecting 1.x
* :bug:`6 (1.0+)` A bug affecting all versions
* :release:`2.0.0 <date>`
* :feature:`5` Another (backwards incompatible) feature!
* :feature:`4` A (backwards incompatible) feature!
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :feature:`3` New feature
* :bug:`2` Another bug
* :bug:`1` An bug
* :release:`1.0.0 <date>`
Result:
* ``2.1.0``: feature #8, feature #9
* ``2.0.1``: bug #6 (but not #7)
* ``1.2.0``: feature #9 (but not #8)
* ``1.1.1``: bug #6, bug #7
* ``1.0.2``: bug #6, bug #7
* ``2.0.0``: feature #4, feature #5
* ``1.1.0``: feature #3
* ``1.0.1``: bug #1, bug #2
Mixed-but-exclusive features prior to a new major release
---------------------------------------------------------
This example illustrates a corner case where one is actively maintaining a
"current" 1.x line at the same time as releasing the new 2.x line. Unlike the
earlier examples, this one has both "2.0-only" *and* "1.0-only" features in the
run-up to 2.0.0 (plus bugs).
In this scenario, the non-annotated features are automatically assigned to the
2.0 major version, even though the 1.2.0 release technically came out "before"
2.0.0.
As long as no non-release line items appear between 1.2.0 and 2.0.0, the system
will behave as if 2.0.0 was the "primary" next release, with 1.2.0 only
capturing features explicitly annotated as being "<2.0" (or similar).
.. note::
This behavior holds true even if the adjacent release line-items have
different dates; the heuristic is solely about their placement in the
changelog list.
Note also how bugs found in this window just prior to 2.0.0, remain associated
with the 1.x line that they are fixing; it wouldn't make sense to publish a
bugfix for unreleased functionality.
Changelog::
* :release:`2.0.0 <date>`
* :release:`1.2.0 <date>`
* :release:`1.1.1 <date>`
* :bug:`6` A bug found after 1.1.0 came out
* :feature:`5 (<2.0)` A 1.0-only feature!
* :feature:`4` A (backwards incompatible) feature!
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :feature:`3` New feature
* :bug:`2` Another bug
* :bug:`1` An bug
* :release:`1.0.0 <date>`
Result:
* ``2.0.0``: feature #4 (but not feature #5)
* ``1.2.0``: feature #5 (but not feature #4)
* ``1.1.1``: bug 6
* ``1.1.0``: feature #3
* ``1.0.1``: bug #1, bug #2
.. _unstable-prehistory:
"Unstable prehistory" mode
==========================
All of the above assumes a mature, semantic-versioning-enabled project, where
you have stable release lines as well as a feature development 'trunk' branch.
This doesn't always describe young projects, however - before one's 1.0.0,
semantic versioning may not apply strongly or at all.
When the ``releases_unstable_prehistory`` option is enabled (it's off by
default for backwards compatibility reasons), changelog parsing/organizing
behaves differently, until releases other than ``0.x.x`` are encountered:
* All issues, regardless of type, are assigned to the very next release;
there's no organizing along minor release lines, no 'major' bugs are
necessary, nor are 'backported' features.
* Unmarked line-items - which are normally considered to be bugs - are
displayed without any classification (i.e. they don't get a 'Bug' prefix).
* This is mostly to enable the types of "pre-Releases" changelogs wherein
*all* line items lack issue-type role prefixes.
* If your changelog *does* include explicit role prefixes (``:bug:``,
``:feature:`` etc) they are left untouched & will still visually appear
as the indicated type.
Example
-------
Here's an example of what this option means. Take the following changelog::
* :release:`0.2.1 <date>`
* Bugfix #7
* Feature #6, but meh, we arbitrarily are gonna call the next release a
tertiary one anyways
* Bugfix #5
* :release:`0.2.0 <date>`
* Medium bugfix #4
* Tiny bugfix #3
* Feature #2
* :release:`0.1.0 <date>`
* It works! First public release.
Under normal Releases behavior this wouldn't match what the author clearly
intends - all of these line items lack roles, so they'd all be "bugs", and then
none of them would get inserted into 0.1.0 or 0.2.0 which are feature releases.
With ``releases_unstable_prehistory`` enabled, we instead get:
* ``0.2.1``: bugfix 5, feature 6, bugfix 7
* ``0.2.0``: feature 2, bugfix 3, bugfix 4
* ``0.1.0``: the beginning-of-time "it works!" note
Crossing the 1.0 boundary
-------------------------
As mentioned, even when this option is enabled, the 1.0.0 release (or
whichever release is the first not beginning with ``0.``) implicitly
deactivates this behavior. All subsequent issues then follow the behavior
outlined in the rest of the document: bugfixes only go in tertiary releases,
features only go in minor releases, etc.
Another explicit example - this changelog (which is even more arbitrary with
its versioning prior to 1.0)::
* :release:`1.1.0 <date>`
* :release:`1.0.1 <date>`
* :feature:`8` A new, backwards compatible feature, hooray
* :bug:`7` First post-1.0 bugfix!
* :release:`1.0.0 <date>`
* Bug #6
* Feature #5
* `0.5.0`
* Feature #4
* Bug #3
* Bug #2
* `0.1.0`
* Feature #1
The resulting changelog is organized like so:
* ``1.1.0``: Feature #8
* ``1.0.1``: Bug #7 - no features, this is the first "real" bugfix release
* ``1.0.0``: Bug #6, feature #5 - this is the last "unstable" release rolling
up all prior issues.
* ``0.5.0``: Bug #2, bug #3, feature #4
* ``0.1.0``: Feature #1
|