Merge pull request #63 from WimpyAnalytics/django2.1

Django 2.1
ramblin-dev · Apr 28, 2019 · 9175144 · 9175144
2 parents f1fabb9 + 2b4fe94
commit 9175144
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 sudo: false
 language: python
 python:
-    - "2.7"
-    - "3.5"
+    - "3.6"
 install: pip install tox-travis
 script: tox
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,10 @@
 History
 -------
 
+3.1.0 (2019-04-27)
+------------------
+Django 2.1 support, drops Django 1.11 (along with Python2.7) support
+
 3.0.0 (2019-03-15)
 ------------------
 Django 2.0 support, drops Django 1.10 support.

diff --git a/andablog/__init__.py b/andablog/__init__.py
@@ -1 +1 @@
-__version__ = '3.0.0'
+__version__ = '3.1.0'
diff --git a/andablog/templates/andablog/base.html b/andablog/templates/andablog/base.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block subtitle %}
     {% block andablog_page_title %}

diff --git a/demo/templates/andablog/base.html b/demo/templates/andablog/base.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block subtitle %}
     {% block andablog_page_title %}

diff --git a/demo/templates/base.html b/demo/templates/base.html
@@ -1,5 +1,5 @@
 {% load trans from i18n %}
-{% load staticfiles %}
+{% load static %}
 
 <!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}">

diff --git a/setup.py b/setup.py
@@ -2,18 +2,15 @@
 # -*- coding: utf-8 -*-
 
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import setup
 
 
 readme = open('README.rst').read()
 history = open('HISTORY.rst').read().replace('.. :changelog:', '')
 
 requirements = [
     'six',
-    'Django>=1.11,<2.1',
+    'Django>=2.0,<2.2',
     'django-model-utils>=3.0,<4.0',
     'django-markupfield>=1.5,<2',
     'django-taggit>=0.22.2,<1.0.0',
@@ -26,13 +23,13 @@
 
 setup(
     name='django-andablog',
-    version='3.0.0',
+    version='3.1.0',
     description='A blog app that is only intended to be embedded within an existing Django site.',
     long_description=readme + '\n\n' + history,
     author='Ivan VenOsdel',
     author_email='ivan@wimpyanalytics.com',
     url='https://github.com/WimpyAnalytics/django-andablog',
-    download_url='https://github.com/wimpyanalytics/django-andablog/tarball/3.0.0',
+    download_url='https://github.com/wimpyanalytics/django-andablog/tarball/3.1.0',
     packages=[
         'andablog',
     ],
@@ -48,12 +45,8 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3 :: Only',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
     ],
     test_suite='tests',
     tests_require=test_requirements,

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36-dj1.11,py35-dj1.11,py27-dj1.11,py36-dj2,py35-dj2,docs
+envlist = py36-dj2,py35-dj2,py36-dj2.1,py35-dj2.1,docs
 
 [testenv]
 changedir = demo
@@ -27,25 +27,20 @@ deps =
     Django>=2,<2.1
     {[testenv]deps}
 
-[testenv:py36-dj1.11]
+[testenv:py36-dj2.1]
 basepython = python3.6
 deps =
-    Django>=1.11,<1.12
+    Django>=2.1,<2.2
     {[testenv]deps}
 
-[testenv:py35-dj1.11]
+[testenv:py35-dj2.1]
 basepython = python3.5
 deps =
-    Django>=1.11,<1.12
-    {[testenv]deps}
-
-[testenv:py27-dj1.11]
-basepython = python2.7
-deps =
-    Django>=1.11,<1.12
+    Django>=2.1,<2.2
     {[testenv]deps}
 
 [testenv:docs]
+basepython = python3.6
 changedir = docs
 deps =
     sphinx