Skip to content

Commit

Permalink
Merge pull request #296 from akaihola/isort-future
Browse files Browse the repository at this point in the history
Include `isort@main` in `test-future` workflow
  • Loading branch information
akaihola authored Feb 22, 2022
2 parents 818a36e + 1d172dc commit 3babc5e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
- os: ubuntu-latest
python-version: '3.10'
constraints: '--constraint constraints-future.txt'
upgrade: '--upgrade --upgrade-strategy=eager'

steps:
- uses: actions/checkout@v2
Expand All @@ -71,10 +72,12 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
env:
pip_options: ${{ matrix.upgrade }} ${{ matrix.constraints }}
run: |
# strict dependency resolution added in pip 20.3
python -m pip install --upgrade 'pip>=20.3'
pip install -e '.[isort,test]' ${{ matrix.constraints }}
pip install ${pip_options} -e '.[isort,test]'
- name: Test with pytest
run: |
pytest
6 changes: 5 additions & 1 deletion .github/workflows/test-future.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ jobs:
run: |
# strict dependency resolution added in pip 20.3
python -m pip install --upgrade 'pip>=20.3'
pip install -e '.[isort,test]' --constraint constraints-future.txt
pip install \
--constraint=constraints-future.txt \
--upgrade \
--upgrade-strategy=eager \
-e '.[isort,test]'
- name: Test with pytest
run: |
pytest
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Added
- Document ``isort``'s requirement to be run in the same environment as
the modules which are processed.
- Document VSCode and ``--lint``/``-L`` incompatibility in the README.
- Guard against breaking changes in ``isort`` by testing against its ``main``
branch in the ``test-future`` GitHub Workflow.

Fixed
-----
Expand All @@ -27,6 +29,8 @@ Added
- Add Nix CI builds on Linux and macOS.
- Add a YAML linting workflow to the Darker repository.
- Updated Mypy to version 0.931.
- Guard against breaking changes in Black by testing against its ``main`` branch
in the ``test-future`` GitHub Workflow.

Fixed
-----
Expand Down
1 change: 1 addition & 0 deletions constraints-future.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
# up-to-date by adding entries for any packages we want to get early
# incompatibility warnings for.
black @ git+https://github.com/psf/black.git@main
isort @ git+https://github.com/PyCQA/isort.git@main

0 comments on commit 3babc5e

Please sign in to comment.