From b2f7b49dcc481cf40a50efd072028b12e65441b5 Mon Sep 17 00:00:00 2001 From: Micah Jerome Ellison Date: Sat, 10 Oct 2020 13:45:27 -0700 Subject: [PATCH] Support Python 3.9 release in build instead of using 3.9 beta --- .travis.yml | 29 ++++++----------------------- pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 552e0ee5..fc929674 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,37 +108,20 @@ jobs: <<: *env_windows JRNL_PYTHON_VERSION: 3.8.2 - # Python 3.9 Dev Tests + # Python 3.9 Tests - name: Python 3.9 on Linux - before_install: - - pip install toml - - python .build/allow_all_python_version.py - python: 3.9-dev + python: 3.9 - <<: *test_mac name: Python 3.9 on MacOS - before_install: - - brew upgrade pyenv - - eval "$(pyenv init -)" - - pyenv install -s $JRNL_PYTHON_VERSION - - pyenv global $JRNL_PYTHON_VERSION - - pip install --upgrade pip - - pip --version - - pip install toml - - python .build/allow_all_python_version.py + python: 3.9 env: - JRNL_PYTHON_VERSION: 3.9.0b5 + JRNL_PYTHON_VERSION: 3.9.0 - <<: *test_windows name: Python 3.9 on Windows - before_install: - - choco install python --pre - - python --version - - python -m pip install --upgrade pip - - pip --version - - pip install toml - - python .build/allow_all_python_version.py + python: 3.9 env: <<: *env_windows - JRNL_PYTHON_VERSION: 3.9.0b5 + JRNL_PYTHON_VERSION: 3.9.0 # ... and beyond! - name: Python nightly on Linux diff --git a/pyproject.toml b/pyproject.toml index 9b4c81f4..3d1f418a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ homepage = "https://jrnl.sh" repository = "https://github.com/jrnl-org/jrnl" [tool.poetry.dependencies] -python = ">=3.7.0, <3.9.0" +python = ">=3.7.0, <3.10.0" pyxdg = "^0.26.0" cryptography = "^3.0" passlib = "^1.7"