Merge branch 'feature/drop_python2' into develop to include changes made to drop Python2 support.

Author: sebastian-code

.travis.yml

@@ -1,12 +1,11 @@
 language: python
 python:
-  - "2.7"
   - "3.5"
   - "3.6"
 
 env:
   matrix:
-   - DJANGO="Django>=1.11,<1.12
+   - DJANGO="Django>=2.0,<2.1"
 
 branches:
   only:

README.rst

@@ -30,6 +30,19 @@ The development of this package is kindly supported by SWAPPS_ and constantly de
 
 Please take in considerations than this application is still under active development and we cannot guarantee that nothing will break between versions. Most of the core features are already there, so we expect to release a beta version soon.
 
+Version compatibility
+=====================
+
+Starting with version 0.10.12, django-qa requires Django 2.0 or later and is only compatible with Python 3.5 or later.
+
+==============  ===================
+Django version  django-qa
+==============  ===================
+2.0 or later    0.10.12
+1.11.x          0.10.11
+==============  ===================
+
+
 Features
 ========
 * Assumes nothing about the rest of your application.

docs/installation.rst

@@ -37,8 +37,3 @@ Run migrations::
 Once all the previous steps have been solved, check the settings topic to include those into your project settings file.
 
 And that's it!
-
-CAVEATS
--------
-There is an issue with django-markdown-app versioning. It does not support django1.11(LTS) and 2 simultaneously.
-If you have a project using django>=2.0, you will need to specify the django-markdown-app manually to the latest.

manage.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import os
 from django.core import management
 

qa/models.py

@@ -2,14 +2,12 @@
 from django.conf import settings
 from django.db import models
 from django.db.models import F
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import slugify
 from django_markdown.models import MarkdownField
 from hitcount.models import HitCountMixin
 from taggit.managers import TaggableManager
 
 
-@python_2_unicode_compatible
 class UserQAProfile(models.Model):
     """Model class to define a User profile for the app, directly linked
     to the core Django user model."""
@@ -28,7 +26,6 @@ def __str__(self):  # pragma: no cover
         return self.user.username
 
 
-@python_2_unicode_compatible
 class Question(models.Model, HitCountMixin):
     """Model class to contain every question in the forum"""
     slug = models.SlugField(max_length=200)
@@ -43,6 +40,9 @@ class Question(models.Model, HitCountMixin):
     negative_votes = models.IntegerField(default=0)
     total_points = models.IntegerField(default=0)
 
+    class Meta:
+        ordering = ['-pub_date']
+
     def save(self, *args, **kwargs):
         if not self.id:
             self.slug = slugify(self.title)
@@ -61,7 +61,6 @@ def __str__(self):
         return self.title
 
 
-@python_2_unicode_compatible
 class Answer(models.Model):
     """Model class to contain every answer in the forum and to link it
     to the proper question."""
@@ -118,7 +117,6 @@ class Meta:
         unique_together = (('user', 'question'),)
 
 
-@python_2_unicode_compatible
 class BaseComment(models.Model):
     """Abstract model to define the basic elements to every single comment."""
     pub_date = models.DateTimeField('date published', auto_now_add=True)

requirements.txt

@@ -1,5 +1,5 @@
-django-annoying==0.10.4
-django-markdown-app==0.9.3.1
-django-taggit==0.22.2
-pytz==2018.5
-django-hitcount==1.3.0
+django-annoying>=0.10.4
+django-markdown-app>=0.9.4.1
+django-taggit>=0.22.2
+pytz>=2018.5
+django-hitcount>=1.3.0

runtests.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8
 from __future__ import unicode_literals, absolute_import
 
 import os

setup.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from setuptools import find_packages, setup
 
 def get_long_description():

test_project/manage.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import os
 import sys
 

test_project/requirements.txt

@@ -5,4 +5,4 @@
 -e ../
 
 # This project requirements
-django-bootstrap3==9.1.0
+django-bootstrap3==10.0.1

test_project/simpleqa/settings.py

@@ -45,14 +45,15 @@
     # 'rest_framework',
 )
 
-MIDDLEWARE = (
+MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
+]
 
 ROOT_URLCONF = 'simpleqa.urls'
 

tests/settings.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8
 from __future__ import unicode_literals, absolute_import
 
 import django
@@ -25,15 +24,16 @@
 
 SECRET_KEY = 'l#^#iad$8$4=dlh74$!xs=3g4jb(&j+y6*ozy&8k1-&d+vruzy'
 
-MIDDLEWARE_CLASSES = (
-        'django.contrib.sessions.middleware.SessionMiddleware',
-        'django.middleware.common.CommonMiddleware',
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.messages.middleware.MessageMiddleware',
-        'django.middleware.clickjacking.XFrameOptionsMiddleware',
-        'django.middleware.locale.LocaleMiddleware',
-        )
+MIDDLEWARE = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
+]
+
 
 ROOT_URLCONF = 'qa.urls'
 

tests/test_views.py

@@ -1,6 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import Client, TestCase, override_settings
 from qa.mixins import LoginRequired
 from qa.models import (Answer, AnswerVote, Question, QuestionComment,