Skip to content

Commit

Permalink
Added Django 2.2 and DjangoCMS 3.7 test configuration (#103)
Browse files Browse the repository at this point in the history
* Fixed isort warnings

* Added django 2.2 and DjangoCMS 3.7 tests

Fixed tests no longer running on python 3.4, since lxml dropped 3.4
support in their latest versions.
  • Loading branch information
decden authored Feb 21, 2020
1 parent 11bedae commit 3851747
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ matrix:
# Django 2.1
- python: 3.6
env: DJANGO='dj21' CMS='cms36'
# Django 2.2
- python: 3.6
env: DJANGO='dj22' CMS='cms37'

install:
- pip install coverage tox
Expand Down
1 change: 1 addition & 0 deletions aldryn_search/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import cms


GTE_CMS_35 = LooseVersion(cms.__version__) >= LooseVersion('3.5')


Expand Down
3 changes: 2 additions & 1 deletion aldryn_search/views.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
from aldryn_common.paginator import DiggPaginator
from django.utils.translation import get_language_from_request
from django.views.generic import ListView
from django.views.generic.edit import FormMixin

from aldryn_common.paginator import DiggPaginator
from haystack.forms import ModelSearchForm
from haystack.query import SearchQuerySet

Expand Down
11 changes: 8 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
envlist =
flake8
isort
py{27,34,35,36}-dj111-cms{34,35,36}
py{34,35,36,37}-dj20-cms36
py{35,36,37}-dj21-cms36
py{27,34,35,36}-dj111-cms{34,35,36,37}
py{34,35,36,37}-dj20-cms{36,37}
py{35,36,37}-dj21-cms{36,37}
py{35,36,37}-dj22-cms37

skip_missing_interpreters=True

Expand Down Expand Up @@ -44,10 +45,14 @@ deps =
dj111: Django>=1.11,<2.0
dj20: Django>=2.0,<2.1
dj21: Django>=2.1,<2.2
dj22: Django>=2.2,<2.3

cms34: django-cms>=3.4,<3.5
cms35: django-cms>=3.5,<3.6
cms36: django-cms>=3.6,<3.7
cms37: django-cms>=3.7,<3.8

py34: lxml<4.4 #lxml 4.4 dropped py34 support
commands =
{envpython} --version
{env:COMMAND:coverage} erase
Expand Down

0 comments on commit 3851747

Please sign in to comment.