From 7aa3c9cdcc8b3048332d268461cfaff8974a9a52 Mon Sep 17 00:00:00 2001 From: Antti Kaihola <13725+akaihola@users.noreply.github.com> Date: Mon, 1 May 2023 19:03:49 +0300 Subject: [PATCH 1/2] Update the change log --- CHANGES.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index a5fd40b58..7bf685705 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,17 @@ These features will be included in the next release: Added ----- + +Fixed +----- + + +1.7.2_ - 2023-07-12 +=================== + +Added +----- +- Add a ``News`` link on the PyPI page. - Allow ``-`` as the single source filename when using the ``--stdin-filename`` option. This makes the option compatible with Black. - Upgrade NixOS tests to use Python 3.11 on both Linux and macOS. @@ -20,6 +31,7 @@ Fixed an ``__init__.py`` in the repository root. - Upgrade ``install-nix-action`` to version 22 in CI to fix an issue with macOS. - Allow ``--target-version=py312`` since newest Black supports it. +- Allow a comment in milestone titles in the ``bump_version`` script. 1.7.1_ - 2023-03-26 @@ -479,7 +491,8 @@ Added ----- - Initial implementation -.. _Unreleased: https://github.com/akaihola/darker/compare/1.7.1...HEAD +.. _Unreleased: https://github.com/akaihola/darker/compare/1.7.2...HEAD +.. _1.7.2: https://github.com/akaihola/darker/compare/1.7.1...1.7.2 .. _1.7.1: https://github.com/akaihola/darker/compare/1.7.0...1.7.1 .. _1.7.0: https://github.com/akaihola/darker/compare/1.6.1...1.7.0 .. _1.6.1: https://github.com/akaihola/darker/compare/1.6.0...1.6.1 From 7708848ba8728e4ed36c3157dc2b165b52869911 Mon Sep 17 00:00:00 2001 From: Antti Kaihola <13725+akaihola@users.noreply.github.com> Date: Mon, 1 May 2023 19:04:28 +0300 Subject: [PATCH 2/2] Bump version number to 1.7.2 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- README.rst | 18 +++++++++--------- action.yml | 4 ++-- src/darker/version.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e5e2f0396..e77ba7bea 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -36,7 +36,7 @@ If applicable, add copy/paste the output or attach a screenshots to help explain - OS: [e.g. Windows / macos / Linux distribution & version] - Python version [e.g. 3.10.4] - Git version [e.g. 2.36.0] - - Darker version [e.g. 1.7.1] + - Darker version [e.g. 1.7.2] - Black version [e.g. 22.3.0] - other reformatter and linter versions [e.g. `isort==5.10.1`, `mypy==0.942` diff --git a/README.rst b/README.rst index d6b718292..b7984d33b 100644 --- a/README.rst +++ b/README.rst @@ -22,9 +22,9 @@ .. |changelog-badge| image:: https://img.shields.io/badge/-change%20log-purple :alt: Change log .. _changelog-badge: https://github.com/akaihola/darker/blob/master/CHANGES.rst -.. |next-milestone| image:: https://img.shields.io/github/milestones/progress/akaihola/darker/23?color=red&label=release%201.7.2 +.. |next-milestone| image:: https://img.shields.io/github/milestones/progress/akaihola/darker/21?color=red&label=release%201.8.0 :alt: Next milestone -.. _next-milestone: https://github.com/akaihola/darker/milestone/23 +.. _next-milestone: https://github.com/akaihola/darker/milestone/21 What? @@ -137,11 +137,11 @@ How? To install or upgrade, use:: - pip install --upgrade darker~=1.7.1 + pip install --upgrade darker~=1.7.2 Or, if you're using Conda_ for package management:: - conda install -c conda-forge darker~=1.7.1 isort + conda install -c conda-forge darker~=1.7.2 isort conda update -c conda-forge darker .. @@ -638,7 +638,7 @@ do the following: .. code-block:: yaml - repo: https://github.com/akaihola/darker - rev: 1.7.1 + rev: 1.7.2 hooks: - id: darker @@ -657,7 +657,7 @@ other reformatter/linter tools you use to known compatible versions, for example .. code-block:: yaml - repo: https://github.com/akaihola/darker - rev: 1.7.1 + rev: 1.7.2 hooks: - id: darker args: @@ -685,7 +685,7 @@ Note the inclusion of the isort Python package under ``additional_dependencies`` .. code-block:: yaml - repo: https://github.com/akaihola/darker - rev: 1.7.1 + rev: 1.7.2 hooks: - id: darker args: [--isort] @@ -730,11 +730,11 @@ Create a file named ``.github/workflows/darker.yml`` inside your repository with with: fetch-depth: 0 - uses: actions/setup-python@v4 - - uses: akaihola/darker@1.7.1 + - uses: akaihola/darker@1.7.2 with: options: "--check --diff --isort --color" src: "./src" - version: "~=1.7.1" + version: "~=1.7.2" lint: "flake8,pylint==2.13.1" There needs to be a working Python environment, set up using ``actions/setup-python`` diff --git a/action.yml b/action.yml index e1aa19f17..4f860e713 100644 --- a/action.yml +++ b/action.yml @@ -14,9 +14,9 @@ inputs: required: false default: "." version: - description: 'Version of Darker to use, e.g. "~=1.7.1", "1.7.1", "@master"' + description: 'Version of Darker to use, e.g. "~=1.7.2", "1.7.2", "@master"' required: false - default: "~=1.7.1" + default: "~=1.7.2" revision: description: >- Git revision range to compare when determining modified lines. diff --git a/src/darker/version.py b/src/darker/version.py index ef611290d..6e3c71eb5 100644 --- a/src/darker/version.py +++ b/src/darker/version.py @@ -1,3 +1,3 @@ """The version number for Darker is governed by this file""" -__version__ = "1.7.1" +__version__ = "1.7.2"