Skip to content

Commit 4dd9f2b

Browse files
committed
Run south migrations in Travis
1 parent f349273 commit 4dd9f2b

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020
- TEST_SUITE=js
2121
- TEST_SUITE=cli
2222
global:
23+
- USE_SOUTH=1
2324
- SENTRY_LIGHT_BUILD=1
2425
- SENTRY_SKIP_BACKEND_VALIDATION=1
2526
install:

setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[pytest]
2-
python_files=test*.py
3-
addopts=--tb=native -p no:doctest
4-
norecursedirs=bin dist docs htmlcov script hooks node_modules .* {args}
2+
python_files = test*.py
3+
addopts = --tb=native -p no:doctest
4+
norecursedirs = bin dist docs htmlcov script hooks node_modules .* {args}
55

66
[flake8]
77
ignore = F999,E501,E128,E124,E402,W503,E731,C901

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
'progressbar>=2.2,<2.4',
112112
'psycopg2>=2.5.0,<2.6.0',
113113
'pytest>=2.6.4,<2.7.0',
114-
'pytest-django>=2.6.0,<2.7.0',
114+
'pytest-django>=2.9.1,<2.10.0',
115115
'python-dateutil>=2.0.0,<3.0.0',
116116
'python-memcached>=1.53,<2.0.0',
117117
'PyYAML>=3.11,<4.0',

src/sentry/utils/pytest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def pytest_configure(config):
9393
}
9494

9595
# Disable South in tests as it is sending incorrect create signals
96-
settings.SOUTH_TESTS_MIGRATE = False
96+
settings.SOUTH_TESTS_MIGRATE = bool(os.environ.get('USE_SOUTH'))
9797

9898
# django mail uses socket.getfqdn which doesn't play nice if our
9999
# networking isn't stable

0 commit comments

Comments
 (0)