Skip to content

run tests on Django 2.2 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 6, 2019
Merged

run tests on Django 2.2 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cd195a
run tests on Django 2.2
tisdall Sep 5, 2019
1101bec
Merge branch 'master' into update_tox
mwarkentin Nov 5, 2019
6bf2807
try switching to mysqlclient
tisdall Nov 5, 2019
58c8633
Merge branch 'update_tox' of github.com:tisdall/django-watchman into …
tisdall Nov 5, 2019
9e8795f
remove unneeded call to PyMySQL
tisdall Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ python:

env:
matrix:
- DJANGO_VERSION=2.2
- DJANGO_VERSION=2.1
- DJANGO_VERSION=2.0
- DJANGO_VERSION=1.11
Expand All @@ -19,6 +20,8 @@ matrix:
env: DJANGO_VERSION=2.0
- python: "2.7"
env: DJANGO_VERSION=2.1
- python: "2.7"
env: DJANGO_VERSION=2.2

install:
- pip install tox coveralls
Expand Down
3 changes: 1 addition & 2 deletions requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ nose>=1.3.0
django-nose>=1.2
flake8>=2.1.0
restructuredtext_lint==0.12.2
# We use PyMySQL because it's pure python, has no C dependencies and can emulate MySQLDb
PyMySQL>=0.7.5
mysqlclient>=1.3.13
tox>=1.7.0
4 changes: 0 additions & 4 deletions runtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
try:
from django.conf import settings

from pymysql import install_as_MySQLdb

install_as_MySQLdb()

settings.configure(
DEBUG=True,
USE_TZ=True,
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
envlist =
covclean,
py27-dj111,
py{35,36,37}-dj{111,20,21},
py{35,36,37}-dj{111,20,21,22},
coverage

[testenv]
Expand All @@ -13,6 +13,7 @@ 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
-r{toxinidir}/requirements-test.txt

[testenv:covclean]
Expand Down