Skip to content

Commit

Permalink
Merge pull request #24 from dstegelman/release-1.0
Browse files Browse the repository at this point in the history
Release 1.0.0
  • Loading branch information
dstegelman committed Apr 16, 2015
2 parents 80eb1b4 + b595555 commit 4d6e9a6
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Derek Stegelman
Copyright (c) 2012 - 2015 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
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include README.md
recursive-include docs/ *
recursive-include downtime/templates/ *

4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## Django Downtime

Small, simple, app to show a down page while you make upgrades.

Official Docs
Expand All @@ -8,6 +10,8 @@ http://django-downtime.readthedocs.org
Install
-------

Django supports versions 1.4 to 1.8 on Python 2.7 and 3.4.

To install django-downtime::

pip install django-downtime
Expand Down
4 changes: 3 additions & 1 deletion build.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ pip install wheel

python setup.py sdist bdist_wheel

twine upload dist/*
twine upload dist/*

tag release
5 changes: 5 additions & 0 deletions demo/demo/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@


MIDDLEWARE_CLASSES = (
'downtime.middleware.DowntimeMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
Expand All @@ -128,6 +129,10 @@
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
)

DOWNTIME_EXEMPT_PATHS = ('/admin',)

DOWNTIME_URL_REDIRECT = "http://google.com"

ROOT_URLCONF = 'demo.urls'

# Python dotted path to the WSGI application used by Django's runserver.
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@

# General information about the project.
project = u'Django Downtime'
copyright = u'2012, Derek Stegelman'
copyright = u'2012 - 2015, 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 = '0.3.3'
version = '1.0.0'
# The full version, including alpha/beta/rc tags.
release = '0.3.3'
release = '1.0.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
5 changes: 0 additions & 5 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ template is loaded with a down time message. This app isn't intended to be a fu
as it still requires that the django site remain functional to work. In other cases it may be more
beneficial to point your domain at a different server instead.

Roadmap
-------

* Add ability to have downtime for different sections of the site only.


Contents:

Expand Down
2 changes: 2 additions & 0 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Installation
============

Django Downtime supports Django 1.4 - 1.8 and Python 2.7 and 3.4.


To install django-downtime::

Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages

version = '0.3.3'
version = '1.0.0'

setup(name='django-downtime',
version=version,
Expand All @@ -17,6 +17,7 @@
"Framework :: Django :: 1.5",
"Framework :: Django :: 1.6",
"Framework :: Django :: 1.7",
"Framework :: Django :: 1.8",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 3",
"Programming Language :: Python",
Expand Down

0 comments on commit 4d6e9a6

Please sign in to comment.