Merge pull request #76 from universalcore/feature/issue-75-add-add-Bo…

…naire-curaçao-and-republic-of-congo

added Bonaire, Curaçao and Republic of Congo

.gitignore

@@ -17,7 +17,7 @@ develop-eggs
 .installed.cfg
 lib
 lib64
-
+.cache
 # Installer logs
 pip-log.txt
 

cms/constants.py

@@ -469,6 +469,7 @@
     "BO": "Bolivia",
     "BA": "Bosnia and Herzegovina",
     "BW": "Botswana",
+    "BQ": "Bonaire",
     "BV": "Bouvet Island",
     "BR": "Brazil",
     "IO": "British Indian Ocean Territory",
@@ -489,13 +490,14 @@
     "CC": "Cocos (Keeling) Islands",
     "CO": "Colombia",
     "KM": "Comoros",
-    "CG": "Congo",
+    "CG": "Congo, Republic of",
     "CD": "Congo, The Democratic Republic of the",
     "CK": "Cook Islands",
     "CR": "Costa Rica",
     "CI": "Cote D'Ivoire",
     "HR": "Croatia",
     "CU": "Cuba",
+    "CW": "Curacao",
     "CY": "Cyprus",
     "CZ": "Czech Republic",
     "DK": "Denmark",

cms/models.py

@@ -134,9 +134,9 @@ def __unicode__(self):  # pragma: no cover
         return self.get_license_display()
 
     def clean(self):
-        if (self.license == CUSTOM_REPO_LICENSE_TYPE
-                and not all([self.custom_license_text,
-                             self.custom_license_name])):
+        if (self.license == CUSTOM_REPO_LICENSE_TYPE and
+                not all([self.custom_license_text,
+                        self.custom_license_name])):
             raise ValidationError(
                 'You must specify a license name & text for a custom license.')
 

cms/tests/test_localisation.py

@@ -2,7 +2,6 @@
 import mock
 
 from PIL import Image
-Image.init()
 
 from django.core.files.images import ImageFile
 from django.conf import settings
@@ -15,6 +14,7 @@
 
 from pycountry import languages
 
+Image.init()
 CURRENT_DIR = os.path.abspath(os.path.split(__file__)[0])
 IMAGE_DIR = os.path.join(CURRENT_DIR, "images")
 

requirements-dev.txt

@@ -1,5 +1,5 @@
-flake8
-pytest
-pytest-django
+flake8==2.5.4
+pytest==2.9.2
+pytest-django==2.9.1
 pytest-cov
 pytest-xdist

requirements.txt

@@ -5,7 +5,7 @@ gunicorn
 python-memcached
 raven==5.0.0
 nose
-django-nose
+django-nose==1.4.2
 django-haystack
 django-celery
 psycopg2