Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak release notes: better version strings #207

Merged
merged 5 commits into from
Mar 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ Additional markers for types of change copied from ``README``:
Unreleased_
-----------

Changed
.......

* ⛏️ Release notes updated to use a better method of updating Flake8 version
strings. Also reduce use of ``vx.y.z`` version strings - use just ``x.y.z``
instead.

See also `latest documentation
<https://flake8-aaa.readthedocs.io/en/latest/#__unreleased_marker__>`_.

Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ cmdbad:

# --- Local dev: Building / Publishing ---

# Generate version signature used in README.rst
.PHONY: signature
signature:
tox e -e py311-meta_plugin -- flake8 --version

.PHONY: clean
clean:
rm -rf dist build .tox .pytest_cache src/flake8_aaa.egg-info
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ string:

6.0.0 (flake8-aaa: 0.13.1, mccabe: 0.7.0, pycodestyle: 2.10.0, pyflakes: 3.0.1) CPython 3.11.0 on Linux

The ``aaa: 0.13.1`` part tells you that Flake8-AAA was installed successfully
and its checks will be used by Flake8.
The ``flake8-aaa: 0.13.1`` part tells you that Flake8-AAA was installed
successfully and its checks will be used by Flake8.

Further reading:

Expand Down
21 changes: 8 additions & 13 deletions docs/release_checklist.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,25 @@ Versioning
Given a new version called ``x.y.z``:

* Create a branch for the new release. Usually called something like
``bump-vx.y.z``.
``bump-x.y.z``.

* Run ``./bump_version.sh [x.y.z]``.

* Commit changes and push ``bump-vx.y.z`` branch for testing.
* Ensure command line output examples in ``README.rst`` are up to date. Run:

Documentation
-------------
.. code-block:: shell

Now is a good time to build and check the documentation locally:
make signature

.. code-block:: shell
Update the version string in the README.

make doc
firefox docs/_build/html/index.html


Ensure that command line output examples are up to date. They can be updated
using the output of the ``cmd`` and ``cmdbad`` ``tox`` environments.
* Commit changes and push ``bump-x.y.z`` branch for testing. Use ``Bump to
x.y.z`` as the PR title.

Merge
-----

* When branch ``bump-vx.y.z`` is green, then merge it to ``master``. All pull
* When branch ``bump-x.y.z`` is green, then merge it to ``master``. All pull
requests are "squash merged".

* Update master locally and ensure that you remain on master for the rest of
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ labels =
deps =
flake8>=4
commands =
flake8 --version
flake8 tests
flake8 examples/good
- bash -c "flake8 examples/bad/ | sort > {envtmpdir}/out"
Expand Down