Skip to content

Commit

Permalink
Merge e467a05 into 05112c1
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier committed Aug 17, 2020
2 parents 05112c1 + e467a05 commit c2e5a88
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: python
dist: xenial
dist: focal

python:
- "3.7"
Expand All @@ -13,8 +13,9 @@ addons:
- travis-ci/sqlite3

env:
- DJANGO="django>=2.2,<3.0"
- DJANGO="django>=3.0,<3.1"
- DJANGO="django~=2.2"
- DJANGO="django~=3.0"
- DJANGO="django~=3.1"

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
coveralls
openwisp-utils[qa]>=0.4.0
openwisp-utils[qa]~=0.6.0
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
django>=2.2,<3.1
django>=2.2,<3.2
django-model-utils>=4.0
jsonfield>=3.1.0,<4.0.0
cryptography>=2.4.0,<2.10.0
cryptography>=2.4.0,<3.1.0
pyopenssl>=17.5.0,<20.0.0
swapper~=1.1
5 changes: 1 addition & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ universal=1
skip = migrations
known_first_party=django_x509
default_section = THIRDPARTY
recursive = 1
line_length=88
multi_line_output=3
use_parentheses=True
Expand All @@ -17,7 +16,5 @@ force_grid_wrap=0
# W504: line break after or after operator
# W605: invalid escape sequence
ignore = W605, W503, W504
exclude = *migrations*,
./tests/*settings*.py,
setup.py
exclude = *migrations/0*,,
max-line-length = 88
2 changes: 1 addition & 1 deletion tests/openwisp2/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@

# local settings must be imported before test runner otherwise they'll be ignored
try:
from local_settings import *
from local_settings import * # noqa
except ImportError:
pass

0 comments on commit c2e5a88

Please sign in to comment.