ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1001 from ostcar/django1.6

Browse Source 
Update to Django 1.6
This commit is contained in:
Norman Jäckel 2013-11-10 12:26:06 -08:00
commit 7b45231211
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/global_settings.py
View File

@ -127,9 +127,6 @@ CACHES = {
} }
} }
TEST_RUNNER = 'discover_runner.DiscoverRunner'
TEST_DISCOVER_TOP_LEVEL = os.path.dirname(os.path.dirname(__file__))
# Hosts/domain names that are valid for this site; required if DEBUG is False # Hosts/domain names that are valid for this site; required if DEBUG is False
# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']

1
requirements.txt
View File

@ -4,7 +4,6 @@
# Requirements for development and tests # Requirements for development and tests
Fabric==1.8.0 Fabric==1.8.0
coverage==3.7 coverage==3.7
django-discover-runner==1.0
flake8==2.0 flake8==2.0
mock==1.0.1 mock==1.0.1

2
requirements_production.txt
View File

@ -1,4 +1,4 @@
Django==1.5.4 Django==1.6.0
django-mptt==0.6.0 django-mptt==0.6.0
reportlab==2.7 reportlab==2.7
pillow==2.2.1 pillow==2.2.1

3
tests/agenda/tests.py
View File

@ -1,6 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.db.models.query import EmptyQuerySet
from django.test.client import Client from django.test.client import Client
from openslides.agenda.models import Item from openslides.agenda.models import Item
@ -29,7 +28,7 @@ class ItemTest(TestCase):
self.assertFalse(self.item1.closed) self.assertFalse(self.item1.closed)
def testParents(self): def testParents(self):
self.assertEqual(type(self.item1.get_ancestors()), EmptyQuerySet) self.assertFalse(self.item1.get_ancestors())
self.assertTrue(self.item1 in self.item3.get_ancestors()) self.assertTrue(self.item1 in self.item3.get_ancestors())
self.assertTrue(self.item1 in self.item4.get_ancestors()) self.assertTrue(self.item1 in self.item4.get_ancestors())
self.assertFalse(self.item2 in self.item4.get_ancestors()) self.assertFalse(self.item2 in self.item4.get_ancestors())