Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Python 3.10 stable in CI #1362

Merged
merged 4 commits into from
Nov 6, 2021
Merged

Use Python 3.10 stable in CI #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14f21ba
Remove special case code needed for Python 3.10 pre-release and try t…
micahellison Oct 23, 2021
16d4049
Wrap 3.10 in quotes so it doesn't resolve to 3.1
micahellison Oct 23, 2021
013f871
Remove pflake --version call that is crashing in Python 3.11-dev
micahellison Oct 23, 2021
d73b042
Run poetry update and restore removed flake8 line
micahellison Oct 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions .github/workflows/testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
if: >
! contains(github.event.head_commit.message, '[ci skip]')
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.python-version == '3.10-dev' }}
continue-on-error: ${{ matrix.python-version == '3.11-dev' }}
strategy:
fail-fast: false
matrix:
python-version: [ 3.7, 3.8, 3.9, 3.10-dev ]
python-version: [ 3.7, 3.8, 3.9, '3.10', 3.11-dev ]
os: [ ubuntu-latest, macos-latest, windows-latest ]

steps:
Expand All @@ -52,7 +52,6 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}-${{ secrets.CACHE_STRING }}

- name: Install dependencies
if: ${{ matrix.python-version != '3.10-dev' }}
run: |
echo '::group::poetry'
pip --disable-pip-version-check install poetry
Expand All @@ -65,29 +64,14 @@ jobs:

echo 'DEPS_INSTALLED=true' >> $GITHUB_ENV


- name: Install dependencies (Prerelease)
if: ${{ matrix.python-version == '3.10-dev' }}
run: |
echo '::group::poetry'
pip --disable-pip-version-check install poetry==1.2.0a2
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: ${{ matrix.python-version != '3.10-dev' && env.DEPS_INSTALLED == 'true' }}
if: ${{ env.DEPS_INSTALLED == 'true' }}
run: |
poetry run black --version
poetry run black --check --diff .

- name: Code Style (flake8)
if: ${{ matrix.python-version != '3.10-dev' && env.DEPS_INSTALLED == 'true' }}
if: ${{ env.DEPS_INSTALLED == 'true' }}
run: |
poetry run pflake8 --version
poetry run pflake8 jrnl tests
Expand Down
106 changes: 49 additions & 57 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ classifiers = [
"Funding" = "https://opencollective.com/jrnl"

[tool.poetry.dependencies]
python = ">=3.7.0, <3.11"
python = ">=3.7.0, <3.12"

ansiwrap = "^0.8.4"
asteval = "^0.9"
Expand Down