Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Django 2.1 #63

Merged
merged 4 commits into from
Apr 28, 2019
Merged

Django 2.1 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08939e6
Bumping for release candidate
ivanvenosdel Apr 27, 2019
bffdf9e
Addressed Django2.1 deprecation
ivanvenosdel Apr 28, 2019
e4e76e6
Skipping candidate release
ivanvenosdel Apr 28, 2019
2b4fe94
Removed python2.7 from travis
ivanvenosdel Apr 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: false
language: python
python:
- "2.7"
- "3.5"
- "3.6"
install: pip install tox-travis
script: tox
4 changes: 4 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion andablog/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.0.0'
__version__ = '3.1.0'
2 changes: 1 addition & 1 deletion andablog/templates/andablog/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load staticfiles %}
{% load static %}

{% block subtitle %}
{% block andablog_page_title %}
Expand Down
2 changes: 1 addition & 1 deletion demo/templates/andablog/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load staticfiles %}
{% load static %}

{% block subtitle %}
{% block andablog_page_title %}
Expand Down
2 changes: 1 addition & 1 deletion demo/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load trans from i18n %}
{% load staticfiles %}
{% load static %}

<!DOCTYPE html>
<html lang="{{ LANGUAGE_CODE }}">
Expand Down
17 changes: 5 additions & 12 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
],
Expand All @@ -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,
Expand Down
17 changes: 6 additions & 11 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down