mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-06-28 05:26:13 +02:00
Add Python 3.10 support (#1271)
* Add Python 3.10 support
* Change Python 3.10 to 3.10-dev in CI
* Run poetry update
* Turn off fail-fast to troubleshoot
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
* Add continue-on-error for 3.10
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
* use prerelease poetry for prerelease python
* fix syntax error
* rename steps to make more sense
* remove dev dependency that breaks with python 3.10
* update tests
* Change test dependencies for minimal breakage on python 3.10
- loosen the test dep requirements (so we get warned about these
problems sooner)
- add new extras group to provide minimal deps required for testing (we
don't need to run static analysis again on every version)
* change how we check if deps are installed so test don't run wild
* add setuptools due to poetry bug, clean up other steps
* update lock file
* test
* Revert "test"
This reverts commit 31e538300e
.
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
This commit is contained in:
parent
56df419bea
commit
2723e1cfb5
3 changed files with 188 additions and 140 deletions
41
.github/workflows/testing.yaml
vendored
41
.github/workflows/testing.yaml
vendored
|
@ -23,9 +23,11 @@ jobs:
|
|||
if: >
|
||||
! contains(github.event.head_commit.message, '[ci skip]')
|
||||
runs-on: ${{ matrix.os }}
|
||||
continue-on-error: ${{ matrix.python-version == '3.10-dev' }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: [ 3.7, 3.8, 3.9 ]
|
||||
python-version: [ 3.7, 3.8, 3.9, 3.10-dev ]
|
||||
os: [ ubuntu-latest, macos-latest, windows-latest ]
|
||||
|
||||
steps:
|
||||
|
@ -44,27 +46,50 @@ jobs:
|
|||
key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}-v2
|
||||
|
||||
- name: Install dependencies
|
||||
if: ${{ matrix.python-version != '3.10-dev' }}
|
||||
run: |
|
||||
echo '::group::poetry'
|
||||
pip install poetry
|
||||
poetry config --local virtualenvs.in-project true
|
||||
echo '::endgroup::'
|
||||
|
||||
echo '::group::Other dependencies'
|
||||
poetry install --remove-untracked
|
||||
echo '::endgroup::'
|
||||
|
||||
echo 'DEPS_INSTALLED=true' >> $GITHUB_ENV
|
||||
|
||||
|
||||
- name: Install dependencies (Prerelease)
|
||||
if: ${{ matrix.python-version == '3.10-dev' }}
|
||||
run: |
|
||||
echo '::group::poetry'
|
||||
pip install poetry==1.2.0a1
|
||||
poetry config --local virtualenvs.in-project true
|
||||
echo '::endgroup::'
|
||||
|
||||
echo '::group::Other dependencies'
|
||||
poetry install --remove-untracked --no-dev --extras testing
|
||||
echo '::endgroup::'
|
||||
|
||||
echo 'DEPS_INSTALLED=true' >> $GITHUB_ENV
|
||||
|
||||
- name: Code formatting (Black)
|
||||
if: success() || failure()
|
||||
if: ${{ matrix.python-version != '3.10-dev' && env.DEPS_INSTALLED == 'true' }}
|
||||
run: |
|
||||
poetry run black --version
|
||||
poetry run black --check --diff .
|
||||
|
||||
- name: Code Style (PyFlakes)
|
||||
if: success() || failure()
|
||||
- name: Code Style (flake8)
|
||||
if: ${{ matrix.python-version != '3.10-dev' && env.DEPS_INSTALLED == 'true' }}
|
||||
run: |
|
||||
poetry run pyflakes --version
|
||||
poetry run pyflakes jrnl features tests
|
||||
poetry run pflake8 --version
|
||||
poetry run pflake8 jrnl features tests
|
||||
|
||||
- name: Test with pytest
|
||||
if: success() || failure()
|
||||
if: ${{ env.DEPS_INSTALLED == 'true' }}
|
||||
run: poetry run pytest --junitxml=reports/pytest/results.xml
|
||||
|
||||
- name: Test with behave
|
||||
if: success() || failure()
|
||||
if: ${{ env.DEPS_INSTALLED == 'true' }}
|
||||
run: poetry run behave --no-skipped --format progress2 --junit --junit-directory reports/behave
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue