diff --git a/.travis.yml b/.travis.yml index 4224992..aa65e0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,45 +3,36 @@ language: python matrix: include: # Linting - - python: 3.7 + - python: 3.8 env: TOXENV=flake8 - - python: 3.7 - env: TOXENV=isort - # Tests - - python: 3.5 - env: TOXENV=py35-django21-wagtail27 - - python: 3.5 - env: TOXENV=py35-django22-wagtail27 - - python: 3.6 - env: TOXENV=py36-django22-wagtail27 - - python: 3.6 - env: TOXENV=py36-django30-wagtail28 - - python: 3.6 - env: TOXENV=py36-django30-wagtail29 - - python: 3.7 - env: TOXENV=py37-django22-wagtail27 - - python: 3.7 - env: TOXENV=py37-django30-wagtail28 - - python: 3.7 - env: TOXENV=py37-django30-wagtail29 - # Only testing Django 2.2+ (instead of all Django/Wagtail combinations) - # against Python 3.8 as Django<=2.2 doesn't officially support Python 3.8 - python: 3.8 - env: TOXENV=py38-django22-wagtail27 + env: TOXENV=isort + # All supported Django/Wagtail combinations with the latest supported Python version - python: 3.8 - env: TOXENV=py38-django22-wagtail28 + env: TOXENV=py38-django22-wagtail210 + - python: 3.9 + env: TOXENV=py39-django22-wagtail211 - python: 3.8 - env: TOXENV=py38-django30-wagtail28 + env: TOXENV=py38-django30-wagtail210 + - python: 3.9 + env: TOXENV=py39-django30-wagtail211 - python: 3.8 - env: TOXENV=py38-django22-wagtail29 + env: TOXENV=py38-django31-wagtail210 + - python: 3.9 + env: TOXENV=py39-django31-wagtail211 + # The latest supported Django/Wagtail combination for the remaining Python versions + - python: 3.6 + env: TOXENV=py36-django31-wagtail211 + - python: 3.7 + env: TOXENV=py37-django31-wagtail211 - python: 3.8 - env: TOXENV=py38-django30-wagtail29 + env: TOXENV=py38-django31-wagtail211 # Future (Should be in `allow_failures`) - python: 3.8 - env: TOXENV=py38-django30-wagtailmaster + env: TOXENV=py39-django31-wagtailmaster allow_failures: # Allow failures against Wagtail master - - env: TOXENV=py38-django30-wagtailmaster + - env: TOXENV=py39-django31-wagtailmaster cache: directories: - $HOME/.cache/pip diff --git a/CHANGELOG.md b/CHANGELOG.md index a0fff98..d076e4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/wagtail/wagtail-bakery/compare/0.4.0...HEAD) +## [Unreleased](https://github.com/wagtail/wagtail-bakery/compare/0.5.0...HEAD) + +## [0.5.0](https://github.com/wagtail/wagtail-bakery/compare/0.4.0...0.5.0) ### Added @@ -13,7 +15,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Removed -- Drop support for Wagtail < 2.7 +- Drop support for Python 3.5 +- Drop support for Django before 2.2 +- Drop support for Wagtail before 2.10 ## [0.4.0](https://github.com/wagtail/wagtail-bakery/compare/0.3.0...0.4.0) diff --git a/setup.py b/setup.py index d97d011..c9c9a45 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ install_requires = [ 'django-bakery~=0.12.7', - 'wagtail>=2.6', + 'wagtail>=2.10', ] test_requires = [ @@ -19,7 +19,7 @@ setup( name='wagtail-bakery', - version='0.4.0', + version='0.5.0', description='A set of helpers for baking your Django Wagtail site out as flat files.', long_description=long_description, long_description_content_type='text/markdown', @@ -40,9 +40,9 @@ 'Framework :: Wagtail :: 2', 'Operating System :: Unix', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', ], ) diff --git a/tox.ini b/tox.ini index 1a2c966..2f85626 100644 --- a/tox.ini +++ b/tox.ini @@ -2,29 +2,27 @@ linting_folders=src/wagtailbakery/ tests/ examples/ [tox] -envlist=py{35,36,37,38}-django{20,21,22,30}-wagtail{27,28,29,master} +envlist=py{36,37,38,39}-django{22,30,31}-wagtail{210,211,master} [testenv] commands=py.test --cov=wagtailbakery --cov-report=xml {posargs} deps= - django20: django>=2.0,<2.1 # WT 2.7 - django21: django>=2.1,<2.2 # WT 2.7, 2.8 - django22: django>=2.2,<2.3 # WT 2.7, 2.8. 2.9 - django30: django>=3.0,<3.1 # WT 2.8, 2.9 - wagtail27: wagtail>=2.7,<2.8 # LTS - wagtail28: wagtail>=2.8,<2.9 # Current -1 - wagtail29: wagtail>=2.9,<2.10 # Current + django22: django>=2.2,<2.3 # WT 2.10, 2.11 + django30: django>=3.0,<3.1 # WT 2.10, 2.11 + django31: django>=3.1,<3.2 # WT 2.10, 2.11 + wagtail210: wagtail>=2.10,<2.11 # Current -1 + wagtail211: wagtail>=2.11,<2.12 # Current, LTS wagtailmaster: git+https://github.com/wagtail/wagtail.git@master#egg=Wagtail extras=test [testenv:flake8] commands=flake8 {[variables]linting_folders} -basepython=python3.7 +basepython=python3.8 skip_install=true deps=flake8 [testenv:isort] commands=isort --check-only --diff {[variables]linting_folders} -basepython=python3.7 +basepython=python3.8 skip_install=true deps=isort