Skip to content

Commit 5d84839

Browse files
committed
Dropped support for django < 1.11
1 parent 9ae7739 commit 5d84839

File tree

6 files changed

+72
-100
lines changed

6 files changed

+72
-100
lines changed

.travis.yml

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
1+
# Config file for automatic testing at travis-ci.org
2+
dist: xenial
13
language: python
4+
5+
sudo: false
26
python:
7+
- "3.7"
8+
- "3.6"
9+
- "3.5"
310
- "3.4"
4-
- "3.3"
511
- "2.7"
6-
- "2.6"
712
env:
8-
- DJANGO="Django>=1.4,<1.5"
9-
- DJANGO="Django>=1.5,<1.6"
10-
- DJANGO="Django>=1.6,<1.7"
11-
- DJANGO="Django>=1.7,<1.8"
12-
- DJANGO="Django>=1.8,<1.9"
13-
- DJANGO="Django>=1.9,<1.10"
13+
- DJANGO="Django>=2.1,<2.2"
14+
- DJANGO="Django>=2.0,<2.1"
15+
- DJANGO="Django>=1.11,<1.12"
1416
- DJANGO="https://github.com/django/django/archive/master.tar.gz"
1517
before_install:
1618
- pip install -q $DJANGO
1719
install:
1820
- python setup.py develop
1921
script:
2022
- python setup.py test
23+
after_success:
24+
- coveralls
2125
matrix:
2226
exclude:
23-
- python: "2.6"
24-
env: DJANGO="Django>=1.7,<1.8"
25-
- python: "2.6"
26-
env: DJANGO="Django>=1.8,<1.9"
27-
- python: "2.6"
28-
env: DJANGO="Django>=1.9,<1.10"
29-
- python: "2.6"
30-
env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
31-
- python: "3.3"
32-
env: DJANGO="Django>=1.4,<1.5"
33-
- python: "3.3"
34-
env: DJANGO="Django>=1.9,<1.10"
35-
- python: "3.3"
36-
env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
3727
- python: "3.4"
38-
env: DJANGO="Django>=1.4,<1.5"
28+
env: DJANGO="Django>=2.1,<2.2"
29+
- python: "2.7"
30+
env: DJANGO="Django>=2.1,<2.2"
31+
- python: "2.7"
32+
env: DJANGO="Django>=2.0,<2.1"
33+
- python: "2.7"
34+
env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
35+
allow_failures:
36+
- env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
Changes
2-
=======
2+
-------
33

44
0.11.2
5-
------
5+
~~~~~~
66

77
- Getting ready for Django 1.10 release.
88
- Dropped support for Django 1.3 and older.
99

1010
0.11.1
11-
------
11+
~~~~~~
1212

1313
- Enable network specify in INTERNAL_IPS
1414

1515
0.11.0
16-
------
16+
~~~~~~
1717

1818
- Added management command to set maintenance mode on/off
1919

2020
0.10.1
21-
------
21+
~~~~~~
2222

2323
- Made sure the app runs on Django 1.8.
2424

2525
0.10.0
26-
------
26+
~~~~~~
2727

2828
- Got rid of dependency on setuptools
2929
- Added ability to exclude specific paths from maintenance mode with the
@@ -33,17 +33,17 @@ Changes
3333
- Made sure the app runs on Django 1.4.
3434

3535
0.9.3
36-
-----
36+
~~~~~~
3737

3838
- Minor documentation updates for the switch to github, expect more changes to follow soon.
3939

4040
0.9.2
41-
-----
41+
~~~~~~
4242

4343
- Fixed an issue with setuptools, thanks for reporting this ksato9700
4444

4545
0.9.1
46-
-----
46+
~~~~~~
4747

4848
- Tested django-maintenancemode with django-1.0 release (following the 1.0.X release branch)
4949
- Bundled buildout.cfg and bootstrap with the source version of the project, allowing repeatable buildout
@@ -55,6 +55,6 @@ Changes
5555
- Updated the documentation and now use pypi as the documentation source (link there from google code)
5656

5757
0.9
58-
-----
58+
~~~~~~
5959

6060
First release

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Copyright (c) 2008, Maykin Media
22
Copyright (c) 2012, enn.io
3-
Copyright (c) 2015, Basil Shubin
3+
Copyright (c) 2015-2019, Basil Shubin
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

runtests.py

Lines changed: 0 additions & 53 deletions
This file was deleted.

setup.py

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,8 @@
44
import re
55
import sys
66
import codecs
7-
import subprocess
87

98
from setuptools import setup, find_packages
10-
from setuptools.command.test import test as TestCommand
11-
12-
13-
class TestRunner(TestCommand):
14-
user_options = []
15-
16-
def run(self):
17-
raise SystemExit(subprocess.call([sys.executable, 'runtests.py']))
189

1910

2011
def read(*parts):
@@ -45,7 +36,7 @@ def find_version(*parts):
4536
],
4637

4738
description="django-maintenancemode allows you to temporary shutdown your site for maintenance work",
48-
long_description=read('README.rst'),
39+
long_description=read('README.rst') + '\n\n' + read('CHANGES.rst'),
4940

5041
author='Remco Wendt',
5142
author_email='remco@maykinmedia.nl',
@@ -60,10 +51,9 @@ def find_version(*parts):
6051
include_package_data=True,
6152

6253
tests_require=[
54+
'django-setuptest',
6355
],
64-
cmdclass={
65-
'test': TestRunner,
66-
},
56+
test_suite='setuptest.setuptest.SetupTestSuite',
6757

6858
zip_safe=False,
6959
classifiers=[
@@ -79,6 +69,9 @@ def find_version(*parts):
7969
'Programming Language :: Python :: 2.7',
8070
'Programming Language :: Python :: 3',
8171
'Programming Language :: Python :: 3.4',
72+
'Programming Language :: Python :: 3.5',
73+
'Programming Language :: Python :: 3.6',
74+
'Programming Language :: Python :: 3.7',
8275
'Topic :: Internet :: WWW/HTTP',
8376
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
8477
],

test_settings.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import os, re
2+
3+
DATABASES = {
4+
'default': {
5+
'ENGINE': 'django.db.backends.sqlite3',
6+
'NAME': ':memory:'
7+
}
8+
}
9+
10+
INSTALLED_APPS = (
11+
'django.contrib.auth',
12+
'django.contrib.admin',
13+
'django.contrib.sessions',
14+
'django.contrib.contenttypes',
15+
'django.contrib.sites',
16+
17+
'maintenancemode',
18+
)
19+
20+
MIDDLEWARE = (
21+
'django.contrib.sessions.middleware.SessionMiddleware',
22+
'django.contrib.auth.middleware.AuthenticationMiddleware',
23+
24+
'maintenancemode.middleware.MaintenanceModeMiddleware',
25+
)
26+
27+
ROOT_URLCONF = 'maintenancemode.tests'
28+
29+
SITE_ID = 1
30+
31+
MAINTENANCE_MODE = True # or ``False`` and use ``maintenance`` command
32+
MAINTENANCE_IGNORE_URLS = (
33+
re.compile(r'^/ignored.*'),
34+
)

0 commit comments

Comments
 (0)