Merge branch 'develop' into master

.travis.yml

@@ -1,54 +1,49 @@
 language: python
 
-matrix:
-  include:
-  - python: "2.7"
-    env: DJANGO_VERSION=1.8.17
-  - python: "2.7"
-    env: DJANGO_VERSION=1.9.12
-  - python: "2.7"
-    env: DJANGO_VERSION=1.10.5
+services:
+  - postgresql
 
-  - python: "3.4"
-    env: DJANGO_VERSION=1.8.17
-  - python: "3.4"
-    env: DJANGO_VERSION=1.9.12
-  - python: "3.4"
-    env: DJANGO_VERSION=1.10.5
+python:
+  - 2.7
+  - 3.4
+  - 3.5
+  - 3.6
+  - nightly
 
-  - python: "3.5"
-    env: DJANGO_VERSION=1.8.17
-  - python: "3.5"
-    env: DJANGO_VERSION=1.9.12
-  - python: "3.5"
-    env: DJANGO_VERSION=1.10.5
-
-  - python: "3.6"
-    env: DJANGO_VERSION=1.8.17
-  - python: "3.6"
-    env: DJANGO_VERSION=1.9.12
-  - python: "3.6"
-    env: DJANGO_VERSION=1.10.5
-
-  - python: "nightly"
-    env: DJANGO_VERSION=1.10.5
+env:
+  - DJANGO_VERSION=1.8.17 DATABASE_ENGINE=sqlite
+  - DJANGO_VERSION=1.8.17 DATABASE_ENGINE=postgres
+  - DJANGO_VERSION=1.9.12 DATABASE_ENGINE=sqlite
+  - DJANGO_VERSION=1.9.12 DATABASE_ENGINE=postgres
+  - DJANGO_VERSION=1.10.5 DATABASE_ENGINE=sqlite
+  - DJANGO_VERSION=1.10.5 DATABASE_ENGINE=postgres
 
 branches:
   only:
     - master
     - develop
+    - /^release\/.$*/
 
 before_install:
   - echo Travis OS Name ... ${TRAVIS_OS_NAME}
   - echo Travis Python .... ${TRAVIS_PYTHON_VERSION}
   - echo Python Version ... $(python --version)
   - echo Django Version ... ${DJANGO_VERSION}
+  - echo Database Used .... ${DATABASE_ENGINE}
 
 install:
   - pip install --upgrade pip
   - pip install -r requirements.txt
   - pip install Django==$DJANGO_VERSION
 
+before_script:
+  - sh -c "
+    if [ '${DATABASE_ENGINE}' = 'postgres' ];
+    then
+      pip install psycopg2;
+      psql -c 'create database travis_ci_test;' -U postgres;
+    fi"
+
 script:
   - make test
   - if [[ ${TRAVIS_PYTHON_VERSION} != 2.* ]]; then make version-check; fi

CHANGELOG.md

@@ -1,5 +1,12 @@
 # django-letsencrypt CHANGELOG
 
+## v1.0.7
+
+- Project changes
+  - Final "feature" release of the 1.x branch. 2.0 will support `mysql`.
+    This had to be done due to certain model upcoming model changes, and
+    will result in a new set of migrations.
+
 ## v1.0.6
 
 - Internal Changes

letsencrypt/__init__.py

@@ -14,6 +14,6 @@
 limitations under the License.
 """
 
-__version__ = '1.0.6'
+__version__ = '1.0.7'
 
 default_app_config = 'letsencrypt.apps.LetsEncryptConfig'

runtests.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-Copyright 2016 Peter Urda
+Copyright 2016-2017 Peter Urda
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,19 +16,35 @@
 limitations under the License.
 """
 
+import os
 import sys
 
 import django
 from django.conf import settings
 from django.test.runner import DiscoverRunner
 
 
-settings.configure(
-    DATABASES={
-      'default': {
-          'ENGINE': 'django.db.backends.sqlite3',
-      }
+DATABASES = {
+    'postgres': {
+        'default': {
+            'ENGINE': 'django.db.backends.postgresql_psycopg2',
+            'NAME': 'travis_ci_test',
+            'USER': 'postgres',
+            'HOST': 'localhost',
+        },
+    },
+
+    'sqlite': {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+        },
     },
+}
+
+DATABASE_ENGINE = os.getenv('DATABASE_ENGINE', default='sqlite')
+
+settings.configure(
+    DATABASES=DATABASES.get(DATABASE_ENGINE, DATABASES['sqlite']),
     DEBUG=True,
     INSTALLED_APPS=(
         'django.contrib.auth',

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='django-letsencrypt',
-    version='1.0.6',
+    version='1.0.7',
     packages=['letsencrypt'],
     include_package_data=True,
     license='Apache License, Version 2.0',