From d72710a8c9d1dd8095f7c013f619d8dd9f11ebe9 Mon Sep 17 00:00:00 2001 From: Derek Stegelman Date: Sun, 3 Jan 2016 07:56:26 -0700 Subject: [PATCH] Updates to docs, remove support for 1.8 and below. --- CHANGELOG.rst | 6 ++++ LICENSE | 2 +- README.md | 2 +- docs/source/conf.py | 6 ++-- docs/source/installation.rst | 2 +- runtests.py | 62 ++++++++++++------------------------ setup.py | 7 ++-- 7 files changed, 34 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b0d95ad..1056fb7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog ========= +1.1.0 +----- + +- Django 1.9 support +- Drop support for below 1.8 + 1.0.4 ----- diff --git a/LICENSE b/LICENSE index b6a42ce..f1e29a0 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ License The MIT License (MIT) -Copyright (c) 2012 - 2015 Derek Stegelman +Copyright (c) 2012 - 2016 Derek Stegelman Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index defc415..e6c6d4c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ http://django-downtime.readthedocs.org Install ------- -Django supports versions 1.4 to 1.8 on Python 2.7 and 3.4. +Django supports versions 1.8 and 1.9 on Python 2 and 3. To install django-downtime:: diff --git a/docs/source/conf.py b/docs/source/conf.py index 4c8e8c9..6d90abf 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -41,16 +41,16 @@ # General information about the project. project = u'Django Downtime' -copyright = u'2012 - 2015, Derek Stegelman' +copyright = u'2012 - 2016, Derek Stegelman' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '1.0.4' +version = '1.1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.4' +release = '1.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/installation.rst b/docs/source/installation.rst index d473ff7..2b681bc 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -2,7 +2,7 @@ Installation ============ -Django Downtime supports Django 1.4 - 1.8 and Python 2.7 and 3.4. +Django Downtime supports Django 1.8 - 1.9 and Python 2 and 3. To install django-downtime:: diff --git a/runtests.py b/runtests.py index 22f8ac3..a86da9c 100644 --- a/runtests.py +++ b/runtests.py @@ -6,48 +6,26 @@ DIRNAME = os.path.dirname(__file__) -if django.VERSION[1] < 4: - # If the version is NOT django 4 or greater - # then remove the TZ setting. - - settings.configure(DEBUG=True, - DATABASES={ - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - } - }, - INSTALLED_APPS=('django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.admin', - 'downtime',)) -else: - settings.configure(DEBUG=True, - DATABASES={ - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - } - }, - INSTALLED_APPS=('django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.admin', - 'downtime',), - USE_TZ=True) - - -try: - # Django 1.7 needs this, but other versions dont. - django.setup() -except AttributeError: - pass -try: - from django.test.simple import DjangoTestSuiteRunner - test_runner = DjangoTestSuiteRunner(verbosity=1) -except ImportError: - from django.test.runner import DiscoverRunner - test_runner = DiscoverRunner(verbosity=1) +settings.configure(DEBUG=True, + DATABASES={ + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + } + }, + INSTALLED_APPS=('django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.admin', + 'downtime',), + USE_TZ=True) + + + +django.setup() + +from django.test.runner import DiscoverRunner +test_runner = DiscoverRunner(verbosity=1) failures = test_runner.run_tests(['downtime', ]) if failures: - sys.exit(failures) \ No newline at end of file + sys.exit(failures) diff --git a/setup.py b/setup.py index 6920a90..3041c84 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = '1.0.4' +version = '1.1.0' setup(name='django-downtime', version=version, @@ -13,11 +13,8 @@ "Natural Language :: English", "Operating System :: OS Independent", "Framework :: Django", - "Framework :: Django :: 1.4", - "Framework :: Django :: 1.5", - "Framework :: Django :: 1.6", - "Framework :: Django :: 1.7", "Framework :: Django :: 1.8", + "Framework :: Django :: 1.9", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python",