From dbadf53303731ca8922ad0ea5723182a5d88709a Mon Sep 17 00:00:00 2001 From: Antti Kaihola <13725+akaihola@users.noreply.github.com> Date: Sun, 15 Jan 2023 23:02:34 +0200 Subject: [PATCH 1/2] Update the change log --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index f3a0941d5..b617a9a6b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -37,6 +37,7 @@ Fixed - Configure ``coverage`` to use relative paths in the Darker repository. This enables use of ``cov_to_lint.py`` - Satisfy Pylint's ``use-dict-literal`` check in Darker's code base. +- Use ``!r`` to quote values in format strings as suggested by recent Flake8 versions. 1.6.1_ - 2022-12-28 From 9942aac6dcc131dbd1381a5852ea8a063782abad Mon Sep 17 00:00:00 2001 From: Antti Kaihola <13725+akaihola@users.noreply.github.com> Date: Sat, 11 Feb 2023 19:20:26 +0200 Subject: [PATCH 2/2] Bump version number to 1.7.0 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CHANGES.rst | 10 ++++++++++ README.rst | 18 +++++++++--------- action.yml | 6 +++--- src/darker/version.py | 2 +- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b3836f97c..56c737c36 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.6.1] + - Darker version [e.g. 1.7.0] - Black version [e.g. 22.3.0] - other reformatter and linter versions [e.g. `isort==5.10.1`, `mypy==0.942` diff --git a/CHANGES.rst b/CHANGES.rst index b617a9a6b..5c01e909b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,16 @@ Unreleased_ These features will be included in the next release: +Added +----- + +Fixed +----- + + +1.7.0_ - 2023-02-11 +=================== + Added ----- - ``-f`` / ``--flynt`` option for converting old-style format strings to f-strings as diff --git a/README.rst b/README.rst index 9a3c3c26a..288d3c4c9 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/19?color=red&label=release%201.7.0 +.. |next-milestone| image:: https://img.shields.io/github/milestones/progress/akaihola/darker/20?color=red&label=release%201.7.1 :alt: Next milestone -.. _next-milestone: https://github.com/akaihola/darker/milestone/19 +.. _next-milestone: https://github.com/akaihola/darker/milestone/20 What? @@ -137,11 +137,11 @@ How? To install or upgrade, use:: - pip install --upgrade darker~=1.6.1 + pip install --upgrade darker~=1.7.0 Or, if you're using Conda_ for package management:: - conda install -c conda-forge darker~=1.6.1 isort + conda install -c conda-forge darker~=1.7.0 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.6.1 + rev: 1.7.0 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.6.1 + rev: 1.7.0 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.6.1 + rev: 1.7.0 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.6.1 + - uses: akaihola/darker@1.7.0 with: options: "--check --diff --isort --color" src: "./src" - version: "~=1.6.1" + version: "~=1.7.0" 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 abead0e38..30334eb88 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.6.1", "1.6.1", "@master"' + description: 'Version of Darker to use, e.g. "~=1.7.0", "1.7.0", "@master"' required: false - default: "~=1.6.1" + default: "~=1.7.0" revision: description: >- Git revision range to compare when determining modified lines. @@ -37,7 +37,7 @@ runs: steps: - name: Commit Range id: commit-range - uses: akaihola/darker/.github/actions/commit-range@1.6.1 + uses: akaihola/darker/.github/actions/commit-range@1.7.0 - name: Run Darker run: | # Exists since using github.action_path + path to main script doesn't diff --git a/src/darker/version.py b/src/darker/version.py index 387a969b7..98cd4a541 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.6.1" +__version__ = "1.7.0"