Skip to content

Commit 1792589

Browse files
committed
requirements corrected
1 parent d67f163 commit 1792589

File tree

5 files changed

+18
-22
lines changed

5 files changed

+18
-22
lines changed

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
djangorestframework~=3.0
2-
mongoengine~=0.9.0
3-
pymongo~=2.0
1+
Django == 1.*
2+
djangorestframework == 3.*
3+
mongoengine == 0.10.*

requirements_dev.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
djangorestframework~=3.0
2-
pymongo~=2.0
3-
mongoengine~=0.9.0
4-
blinker~=1.0
5-
Django~=1.8.0
61
pytest~=2.0
72
pytest-django~=2.0

requirements_test.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/conftest.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ def pytest_configure():
1111
USE_L10N=True,
1212
STATIC_URL='/static/',
1313
ROOT_URLCONF='tests.urls',
14-
TEMPLATE_LOADERS=(
15-
),
16-
MIDDLEWARE_CLASSES=(
17-
),
14+
TEMPLATE_LOADERS=(),
15+
MIDDLEWARE_CLASSES=(),
1816
INSTALLED_APPS=(
17+
'django.contrib.auth',
18+
'django.contrib.contenttypes',
1919
'rest_framework',
2020
'rest_framework_mongoengine',
2121
'tests',
2222
),
23-
PASSWORD_HASHERS=(
24-
),
23+
AUTHENTICATION_BACKENDS=(),
24+
PASSWORD_HASHERS=(),
2525
)
2626

2727
from mongoengine import connect

tox.ini

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
[tox]
2-
envlist=py{27,34}-me{09,010}
2+
envlist=dj{18,19}-py{27,34}-me{09,010}
33

44
[testenv]
5-
deps = -rrequirements_test.txt
5+
deps =
6+
-rrequirements_dev.txt
7+
dj18: Django==1.8.*
8+
dj19: Django==1.9.*
9+
djangorestframework == 3.*
10+
blinker==1.*
611
me09: mongoengine==0.9.*
12+
me09: pymongo==2.*
713
me010: mongoengine==0.10.*
14+
me010: pymongo==3.*
815
commands = ./runtests.py {posargs}

0 commit comments

Comments
 (0)