Skip to content

Commit

Permalink
Bump Wagtail and Python versions (APSL#211)
Browse files Browse the repository at this point in the history
  • Loading branch information
marctc authored Dec 1, 2019
1 parent 8fa8c0d commit f7642c7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
14 changes: 13 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,26 @@ matrix:
python: 3.5
- env: TOXENV=py36-dj20
python: 3.6
- env: TOXENV=py37-dj20
python: 3.7
- env: TOXENV=py38-dj20
python: 3.8
- env: TOXENV=py35-dj21
python: 3.5
- env: TOXENV=py36-dj21
python: 3.6
- env: TOXENV=py36-dj22
python: 3.6
- env: TOXENV=py37-dj21
python: 3.7
- env: TOXENV=py37-dj22
python: 3.7
- env: TOXENV=py38-dj21
python: 3.8
- env: TOXENV=py38-dj22
python: 3.8
- env: TOXENV=flake8
python: 3.5
python: 3.7
before_install:
- curl -L https://github.com/docker/compose/releases/download/1.8.0/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def get_email(package):
long_description=codecs.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read(),
install_requires=[
'Django>=2.1.6,<3.0',
'wagtail>=2.4,<2.7',
'wagtail>=2.7,<3.0',
'django-el-pagination>=3.2.4',
'django-social-share>=1.3.0',
'django-colorful>=1.3'
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{35,36}-dj{20,21,22}, flake8
envlist = py{35,36,37,38}-dj{20,21,22}, flake8

[flake8]
max-line-length = 120
Expand All @@ -17,6 +17,8 @@ commands =
basepython =
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8

deps =
selenium==3.3
Expand All @@ -34,6 +36,6 @@ deps =
dj22: Django>=2.2,<3.0

[testenv:flake8]
basepython = python3.5
basepython = python3.7
deps = flake8==3.0.4
commands = flake8 puput tests --exclude=migrations

0 comments on commit f7642c7

Please sign in to comment.