Skip to content

Commit

Permalink
requirements corrected
Browse files Browse the repository at this point in the history
  • Loading branch information
qwiglydee committed Dec 22, 2015
1 parent d67f163 commit 1792589
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 22 deletions.
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
djangorestframework~=3.0
mongoengine~=0.9.0
pymongo~=2.0
Django == 1.*
djangorestframework == 3.*
mongoengine == 0.10.*
5 changes: 0 additions & 5 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
djangorestframework~=3.0
pymongo~=2.0
mongoengine~=0.9.0
blinker~=1.0
Django~=1.8.0
pytest~=2.0
pytest-django~=2.0
6 changes: 0 additions & 6 deletions requirements_test.txt

This file was deleted.

12 changes: 6 additions & 6 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ def pytest_configure():
USE_L10N=True,
STATIC_URL='/static/',
ROOT_URLCONF='tests.urls',
TEMPLATE_LOADERS=(
),
MIDDLEWARE_CLASSES=(
),
TEMPLATE_LOADERS=(),
MIDDLEWARE_CLASSES=(),
INSTALLED_APPS=(
'django.contrib.auth',
'django.contrib.contenttypes',
'rest_framework',
'rest_framework_mongoengine',
'tests',
),
PASSWORD_HASHERS=(
),
AUTHENTICATION_BACKENDS=(),
PASSWORD_HASHERS=(),
)

from mongoengine import connect
Expand Down
11 changes: 9 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
[tox]
envlist=py{27,34}-me{09,010}
envlist=dj{18,19}-py{27,34}-me{09,010}

[testenv]
deps = -rrequirements_test.txt
deps =
-rrequirements_dev.txt
dj18: Django==1.8.*
dj19: Django==1.9.*
djangorestframework == 3.*
blinker==1.*
me09: mongoengine==0.9.*
me09: pymongo==2.*
me010: mongoengine==0.10.*
me010: pymongo==3.*
commands = ./runtests.py {posargs}

0 comments on commit 1792589

Please sign in to comment.