Remove special case code needed for Python 3.10 pre-release and try to get Python 3.11 pre-release running on CI

This commit is contained in:
Micah Jerome Ellison 2021-10-23 15:16:51 -07:00
parent b4ccf44d3a
commit 14f21ba413
2 changed files with 5 additions and 21 deletions

View file

@ -29,11 +29,11 @@ jobs:
if: > if: >
! contains(github.event.head_commit.message, '[ci skip]') ! contains(github.event.head_commit.message, '[ci skip]')
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.python-version == '3.10-dev' }} continue-on-error: ${{ matrix.python-version == '3.11-dev' }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: 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 ] os: [ ubuntu-latest, macos-latest, windows-latest ]
steps: steps:
@ -52,7 +52,6 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}-${{ secrets.CACHE_STRING }} key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}-${{ secrets.CACHE_STRING }}
- name: Install dependencies - name: Install dependencies
if: ${{ matrix.python-version != '3.10-dev' }}
run: | run: |
echo '::group::poetry' echo '::group::poetry'
pip --disable-pip-version-check install poetry pip --disable-pip-version-check install poetry
@ -65,29 +64,14 @@ jobs:
echo 'DEPS_INSTALLED=true' >> $GITHUB_ENV 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) - name: Code formatting (Black)
if: ${{ matrix.python-version != '3.10-dev' && env.DEPS_INSTALLED == 'true' }} if: ${{ env.DEPS_INSTALLED == 'true' }}
run: | run: |
poetry run black --version poetry run black --version
poetry run black --check --diff . poetry run black --check --diff .
- name: Code Style (flake8) - name: Code Style (flake8)
if: ${{ matrix.python-version != '3.10-dev' && env.DEPS_INSTALLED == 'true' }} if: ${{ env.DEPS_INSTALLED == 'true' }}
run: | run: |
poetry run pflake8 --version poetry run pflake8 --version
poetry run pflake8 jrnl tests poetry run pflake8 jrnl tests

View file

@ -27,7 +27,7 @@ classifiers = [
"Funding" = "https://opencollective.com/jrnl" "Funding" = "https://opencollective.com/jrnl"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = ">=3.7.0, <3.11" python = ">=3.7.0, <3.12"
ansiwrap = "^0.8.4" ansiwrap = "^0.8.4"
asteval = "^0.9" asteval = "^0.9"