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:
Micah Jerome Ellison 2021-07-10 12:13:15 -07:00 committed by GitHub
parent 56df419bea
commit 2723e1cfb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 188 additions and 140 deletions

View file

@ -27,7 +27,7 @@ classifiers = [
"Funding" = "https://opencollective.com/jrnl"
[tool.poetry.dependencies]
python = ">=3.7.0, <3.10"
python = ">=3.7.0, <3.11"
ansiwrap = "^0.8.4"
asteval = "^0.9"
@ -43,17 +43,28 @@ pyyaml = ">=5.1"
pytz = ">=2020" # https://pythonhosted.org/pytz/#issues-limitations
tzlocal = ">2.0, <3.0" # https://github.com/regebro/tzlocal/blob/master/CHANGES.txt
# Minimal deps required for testing
# I don't like repeating deps here, but
# there's no other way to do this yet until poetry v1.2 releases
# see: https://github.com/python-poetry/poetry/issues/1644
behave = { version = "^1.2" , optional = true }
pytest = { version = ">=6.2" , optional = true }
pytest-bdd = { version = ">=4.0.1" , optional = true }
toml = { version = ">=0.10" , optional = true }
[tool.poetry.dev-dependencies]
behave = "^1.2"
mkdocs = "^1.0"
black = {version = "^21.5b2",allow-prereleases = true}
mkdocs = ">=1.0"
black = { version = ">=21.5b2", allow-prereleases = true }
toml = ">=0.10"
pytest = ">=6.2"
pytest-bdd = "^4.0.1"
yq = ">=2.11"
ipdb = ">=0.13"
pytest-clarity = "^0.3.0-alpha.0"
pyproject-flake8 = "^0.0.1-alpha.2"
pytest-bdd = ">=4.0.1"
ipdb = "*"
pytest-clarity = "*"
pyproject-flake8 = "*"
[tool.poetry.extras]
testing = [ "behave", "pytest", "pytest-bdd", "toml" ]
[tool.poetry.scripts]
jrnl = 'jrnl.cli:cli'