Skip to content

Commit

Permalink
Rough draft of versioning guide based on @thatch in facebook#147
Browse files Browse the repository at this point in the history
  • Loading branch information
amyreese committed Sep 13, 2022
1 parent f8cec78 commit afd7630
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 13 deletions.
12 changes: 3 additions & 9 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ When a PR has been accepted:

* Update PR title if necessary to clarify purpose.
* Prefer using merge commits from Github to record PR name and number.
* For automated PR's (like pyup.io), prefer using rebase from Github UI.
* For automated PR's (like dependabot), prefer using rebase from Github UI.

## Releasing New Versions

Expand All @@ -35,14 +35,8 @@ in the repo, but there's more to cutting a release than just tagging a commit.
Please follow this guide when releasing new versions of µsort:

1. Decide on the next version number, based on what has been added to the `main`
branch since the previous release:

* Major breaking changes should increment the first number and reset the
other two, eg `1.10.0 -> 2.0.0`.
* New features should increment the second number and reset the third,
eg `1.10.0 -> 1.11.0`.
* Bug fixes or performance improvements should only increment the third number,
eg `1.10.0 -> 1.10.1`.
branch since the previous release. See the
[Versioning Guide](https://usort.rtfd.io/en/latest/versioning.html).

2. Update `CHANGELOG.md` with the new version, following the same pattern as
previous versions. Entries should reference both the PR number and any
Expand Down
91 changes: 87 additions & 4 deletions docs/versioning.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,91 @@

.. _versioning:

Versioning Guide
================
Versioning
==========

µsort tries to maintain the *spirit* of `SemVer <https://semver.org/>`_ while focusing
more on the sorting and formatting results than strictly on the API contract.
µsort tries to maintain the *spirit* of `SemVer <https://semver.org/>`_ while
focusing primarily on the sorting and formatting results than strictly on the
API contract.

In general, µsort will attempt to maintain consistent formatting results within
a major version, with a best-effort attempt to remain "backwards compatible"
with previous versions of µsort within that major release. Except for obvious
or egregious formatting errors, any file sorted by a newer release of µsort
should produce no changes if formatted by previous minor/patch versions
in that family. Our goal is to enable a safe and consistent rollout of new
sorting or formatting behavior within minor version releases, before updating
CI or toolchains to the latest release.

For example, a file already sorted by µsort ``1.1.3`` may produce changes when
sorted by a newer µsort ``1.2.1`` release, but a file already sorted by ``1.2.1``
should remain unchanged if sorted again by ``1.1.3``. However, a file sorted by
a future µsort ``2.0.0`` release may not be stable if sorted again by version
``1.2.1``.


Details
-------

It is our intent to:

1. Bump the post version (and yank the original, depending on how severe) for:

- documentation or packaging issues, such as missing files in the sdist
or unintended classifiers

2. Bump the patch version for:

- garden-variety bugs, such as those where the previous behavior was an exception
(such as `#194 <https://github.com/facebookexperimental/usort/issues/194>`_)
- any bug that produces output so mangled it would not have been accepted
by human review (such as producing mojibake)

Additionally, if the bug causes data loss, we will also yank affected
releases (best effort), but the timing of the yank is not defined here.
The spirit of this is to prevent people from installing known-bad versions,
but if people pin then yanking is a sign, not a cop.

3. Bump the minor version for:

- new features that may change the output (at the byte level) for greenfield
sorting, but produce output that can then be sorted with previou versions
(see above) without producing additional changes
(such as `#140 <https://github.com/facebookexperimental/usort/issues/140>`_)
- anything that includes a new config option (although the defaults for
those config options must keep previous behavior); if a consumer project
relies on a certain config option, it is on them to constrain to `>=`
the version where that was added
- any new ``DeprecationWarning``
- changing strings intended for humans (e.g. ``Result.warnings``) or exception
classes (e.g. ``Result.exception``, or its specific values or hierarchy)
which are not strongly considered "part of the API"

4. Bump the major for:

- any formatting change that fails "test_backwards_compatibility" on CI,
which formats some ever-growing piece of code with the development
version, then downgrades to the earliest known release from that major
series and confims no diff
- any intentional change to picking ``pyproject.toml`` or inferring
first-party names
- any backwards-incompatible API change or removal

Additionally, within reason we will yank releases that should have bumped
the major but didn't, once informed.

5. Note that we assume our deps follow reasonable versioning practices
(and since several of them are us with another hat on, this is believable).
In particular:

- We rely on ``trailrunner`` and constrain to a major version, under the
assumption that if trailrunner ever has a non-silly case where it would
choose a different ``pyproject.toml`` that it would bump the major.
Examples of silly cases are UNC paths on windows, bind-mounted path
loops on linux.
- We rely on ``stdlibs`` to classify top-level names in the stdlib section
or not. This is date-versioned currently, and in general we *want* the
updates like `stdlibs#25 <https://github.com/omnilib/stdlibs/pull/25>`_,
even though that *can* cause formatting changes in uncommon cases.
If you are sensitive to this, consider pinning ``stdlibs`` as well as
``usort`` and ``black``.

0 comments on commit afd7630

Please sign in to comment.