EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make it work in django 1.8

pull/91/head
eric 2018-04-25 17:20:44 -04:00
parent 120c0eea5a
commit 8f600f1556
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests.py
View File

@ -193,7 +193,7 @@ class BookLoaderTests(TestCase):
self.assertEqual(models.Work.objects.all().count(), before) self.assertEqual(models.Work.objects.all().count(), before)
def test_missing_isbn(self): def test_missing_isbn(self):
e = bookloader.add_by_isbn_from_google('0139391401') e = bookloader.add_by_isbn_from_google('9781938616990') #unassigned in gluejar block
self.assertEqual(e, None) self.assertEqual(e, None)
def test_thingisbn_mock(self): def test_thingisbn_mock(self):

4
payment/tests.py
View File

@ -20,11 +20,7 @@ from django.contrib.auth.models import User
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.validators import URLValidator from django.core.validators import URLValidator
from django.test import TestCase from django.test import TestCase
<<<<<<< HEAD
=======
from django.utils import unittest
from django.utils.timezone import now from django.utils.timezone import now
>>>>>>> Gluejar/master
""" """
regluit imports regluit imports

2
requirements_versioned.pip
View File

@ -1,4 +1,4 @@
Django==1.9.13 Django==1.8.14
Fabric==1.6.0 Fabric==1.6.0
MySQL-python==1.2.5 MySQL-python==1.2.5
Pillow==3.4.2 Pillow==3.4.2