Skip to content

Commit

Permalink
Merge pull request #415 from hugovk/add-3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
akaihola authored Dec 26, 2022
2 parents 37175ef + 0f48f9e commit 4785ed1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- build-wheel
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v17
- uses: cachix/install-nix-action@v18
with:
nix_path: nixpkgs=channel:nixos-21.11
- name: Download wheel uploaded by the build-wheel job
Expand Down Expand Up @@ -88,13 +88,15 @@ jobs:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12-dev'
constraints: ['black==22.12.0']
include:
- os: ubuntu-latest
python-version: '3.7'
constraints: '--constraint constraints-oldest.txt'
- os: ubuntu-latest
python-version: '3.10'
python-version: '3.11'
constraints: '--constraint constraints-future.txt'
upgrade: '--upgrade --upgrade-strategy=eager'
needs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-future.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.x'
- name: Install dependencies
run: |
# strict dependency resolution added in pip 20.3
Expand Down
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ These features will be included in the next release:

Added
-----
- Declare Python 3.11 as supported in package metadata.

Fixed
-----
- Pin Black to version 22.12.0 in the CI build to ensure consistent formatting of
Darker's own code base.
- Fix compatibility with ``black-22.10.1.dev19+gffaaf48`` and later – an argument was
replaced in ``black.files.gen_python_files()``.


1.6.0_ - 2022-12-19
Expand Down Expand Up @@ -131,7 +134,7 @@ Fixed
- Consider ``.py.tmp`` as files which should be reformatted.
This enables VSCode Format On Save.
- Use the latest release of Darker instead of 1.3.2 in the GitHub Action.


1.4.0_ - 2022-02-08
===================
Expand Down
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> { }, pythonVersion ? "python310" }:
{ pkgs ? import <nixpkgs> { }, pythonVersion ? "python311" }:
(
pkgs.stdenv.mkDerivation {
name = "darker-test";
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ classifiers =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
project_urls =
Source Code = https://github.com/akaihola/darker
Change Log = https://github.com/akaihola/darker/blob/master/CHANGES.rst
Expand Down Expand Up @@ -85,4 +86,4 @@ ignore =

[codespell]
ignore-words-list = nd
skip = .git,*.json
skip = .git,*.json

0 comments on commit 4785ed1

Please sign in to comment.