Skip to content

Commit

Permalink
Merge branch 'master' into add-3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored Dec 20, 2022
2 parents 68bd7e5 + 7057de2 commit 5fed3c0
Show file tree
Hide file tree
Showing 10 changed files with 123 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.1]
- Darker version [e.g. 1.6.0]
- Black version [e.g. 22.3.0]
- other reformatter and linter versions [e.g. `isort==5.10.1`, `mypy==0.942`

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/help-in-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: pip install -e '.[isort]'
- run: pip install '.[isort]'
- name: Verify that README contains output of darker --help
shell: python
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test-bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ jobs:
# reviewing pull requests in `README.rst`.
run: |
pip install click packaging requests
python release_tools/bump_version.py --minor --dry-run
python release_tools/bump_version.py \
--minor \
--dry-run \
--token=${{ secrets.GITHUB_TOKEN }}
22 changes: 19 additions & 3 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,27 @@ Added

Fixed
-----


1.6.0_ - 2022-12-19
===================

Added
-----
- Upgrade linters in CI and modify code to satisfy their new requirements.
- Upgrade to ``setup-python@v4`` in all GitHub workflows.
- ``bump_version.py`` now accepts an optional GitHub token with the ``--token=``
argument. The ``test-bump-version`` workflow uses that, which should help deal with
GitHub's API rate limiting.

Fixed
-----
- Fix compatibility with ``black-22.10.1.dev19+gffaaf48`` and later – an argument was
replaced in ``black.files.gen_python_files()``.

- Upgrade to ``setup-python@v4`` in all GitHub workflows. May be required due to
deprecation of ``set-output``.
- Upgrade CI to use environment files instead of the deprecated ``set-output`` method.
- Fix Safety check in CI.
- Don't do a development install in the ``help-in-readme.yml`` workflow. Something
broke this recently.


1.5.1_ - 2022-09-11
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Aaron Denney (@wnoise)
- Aditya Gandra (@agandra)
- Aljaž Mur Eržen (@aljazerzen)
- Antti Kaihola (@akaihola)
- August Masquelier (@levouh)
- Axel Dahlberg (@AckslD)
Expand Down Expand Up @@ -66,6 +67,7 @@
- Sean Hammond (@sherbie)
- Shantanu (@hauntsaninja)
- Simone Gaiarin (@simgunz)
- Stefaan Lippens (@soxofaan)
- Talha Juanid (@talhajunaidd)
- Thomas Güttler (@guettli)
- TJ Kolleh (@tkolleh)
Expand Down
Loading

0 comments on commit 5fed3c0

Please sign in to comment.