Skip to content

Commit 4619bf9

Browse files
hirokinkohirokinko
authored
Merge pull request #108 from uncovertruth/feature/remove_eol_versions
Remove eol versions
2 parents cc1a268 + 8f4a818 commit 4619bf9

File tree

15 files changed

+67
-96
lines changed

15 files changed

+67
-96
lines changed

‎.travis.yml‎

Lines changed: 30 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,38 @@ cache: pip
44
matrix:
55
fast_finish: true
66
include:
7-
- python: 2.7
8-
env: TOX_ENV=py27-dj19
9-
- python: 3.4
10-
env: TOX_ENV=py34-dj19
11-
- python: 3.5
12-
env: TOX_ENV=py35-dj19
13-
- python: 2.7
14-
env: TOX_ENV=py27-dj110
15-
- python: 3.4
16-
env: TOX_ENV=py34-dj110
17-
- python: 3.5
18-
env: TOX_ENV=py35-dj110
19-
- python: 2.7
20-
env: TOX_ENV=py27-dj111
21-
- python: pypy
22-
env: TOX_ENV=pypy-dj111
23-
- python: 3.4
24-
env: TOX_ENV=py34-dj111
25-
- python: 3.5
26-
env: TOX_ENV=py35-dj111
27-
- python: 3.6
28-
env: TOX_ENV=py36-dj111
29-
- python: pypy3
30-
env: TOX_ENV=pypy3-dj111
31-
- python: 3.4
32-
env: TOX_ENV=py34-dj20
33-
- python: 3.5
34-
env: TOX_ENV=py35-dj20
35-
- python: 3.6
36-
env: TOX_ENV=py36-dj20
37-
- python: pypy3
38-
env: TOX_ENV=pypy3-dj20
39-
- python: 3.5
40-
env: TOX_ENV=py35-djdev
41-
- python: 3.6
42-
env: TOX_ENV=py36-djdev
43-
- python: 3.6
44-
env: TOX_ENV=flake8
45-
- python: 3.6
46-
env: TOX_ENV=isort
47-
- python: 3.6
48-
env: TOX_ENV=readme
49-
- python: 3.6
50-
env: TOX_ENV=check-manifest
7+
- env: TOX_ENV=py27-dj111
8+
python: 2.7
9+
- env: TOX_ENV=py34-dj111
10+
python: 3.4
11+
- env: TOX_ENV=pypy-dj111
12+
python: pypy
13+
- env: TOX_ENV=py35-dj111
14+
python: 3.5
15+
- env: TOX_ENV=py36-dj111
16+
python: 3.6
17+
- env: TOX_ENV=pypy3-dj111
18+
python: pypy3
19+
- env: TOX_ENV=py34-dj20
20+
python: 3.4
21+
- env: TOX_ENV=py35-dj20
22+
python: 3.5
23+
- env: TOX_ENV=py36-dj20
24+
python: 3.6
25+
- env: TOX_ENV=pypy3-dj20
26+
python: pypy3
27+
- env: TOX_ENV=py35-djmaster
28+
python: 3.5
29+
- env: TOX_ENV=py36-djmaster
30+
python: 3.6
31+
- env: TOX_ENV=flake8
32+
- env: TOX_ENV=isort
33+
- env: TOX_ENV=readme
34+
- env: TOX_ENV=check-manifest
5135
allow_failures:
52-
- env: TOX_ENV=py35-djdev
53-
- env: TOX_ENV=py36-djdev
36+
- env: TOX_ENV=py35-djmaster
37+
- env: TOX_ENV=py36-djmaster
5438
# Use old sqlite3 that does not support shared memory
55-
- env: TOX_ENV=py27-dj19
56-
- env: TOX_ENV=py27-dj110
5739
- env: TOX_ENV=py27-dj111
5840
- env: TOX_ENV=pypy-dj111
5941
addons:

‎HISTORY.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
History
33
=======
44

5+
1.1.0 (2018-03-30)_
6+
7+
* Drop support for Django 1.9, 1.10
8+
9+
1.0.0 (2018-02-02)
10+
------------------
11+
12+
* Add support for Django 2.0
13+
* Drop support for Django 1.8
14+
515
0.0.1 (2017-05-22)
616
------------------
717

‎horizon/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
__author__ = """UNCOVER TRUTH Inc."""
44
__email__ = '[email protected]'
5-
__version__ = '1.0.0'
5+
__version__ = '1.1.0'

‎horizon/models.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
get_or_create_index,
2121
)
2222

23-
2423
_HORIZON_OPTIONS = (
2524
'horizontal_group',
2625
'horizontal_key',

‎horizon/routers.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
get_or_create_index,
1616
)
1717

18-
1918
logger = logging.getLogger(__name__)
2019

2120

‎horizon/settings.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from django.conf import settings
66
from django.utils.lru_cache import lru_cache
77

8-
98
CONFIG_DEFAULTS = {
109
'GROUPS': {},
1110
'METADATA_MODEL': None,

‎horizon/utils.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,17 @@
55
import logging
66
import random
77

8-
import django
98
from django.apps import apps
109
from django.core.exceptions import ImproperlyConfigured
1110

1211
from .settings import get_config
1312

14-
1513
logger = logging.getLogger(__name__)
1614

1715

1816
def get_metadata_model():
1917
try:
20-
if (1, 11) > django.VERSION:
21-
return apps.get_model(get_config()['METADATA_MODEL'])
22-
else:
23-
return apps.get_model(get_config()['METADATA_MODEL'], require_ready=False)
24-
18+
return apps.get_model(get_config()['METADATA_MODEL'], require_ready=False)
2519
except ValueError:
2620
raise ImproperlyConfigured("METADATA_MODEL must be of the form 'app_label.model_name'")
2721
except LookupError:

‎setup.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ exclude =
2525
include_trailing_comma=True
2626
line_length=80
2727
multi_line_output=3
28+
skip=migrations
2829
not_skip=__init__.py
2930
known_first_party=horizon
3031

‎setup.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
history = history_file.read()
1313

1414
requirements = [
15-
'Django>=1.9',
15+
'Django>=1.11',
1616
]
1717

1818
test_requirements = [
@@ -38,8 +38,6 @@
3838
classifiers=[
3939
'Development Status :: 2 - Pre-Alpha',
4040
'Environment :: Web Environment',
41-
'Framework :: Django :: 1.9',
42-
'Framework :: Django :: 1.10',
4341
'Framework :: Django :: 1.11',
4442
'Framework :: Django :: 2.0',
4543
'Intended Audience :: Developers',
@@ -49,7 +47,6 @@
4947
'Programming Language :: Python :: 2',
5048
'Programming Language :: Python :: 2.7',
5149
'Programming Language :: Python :: 3',
52-
'Programming Language :: Python :: 3.3',
5350
'Programming Language :: Python :: 3.4',
5451
'Programming Language :: Python :: 3.5',
5552
'Programming Language :: Python :: 3.6',

‎tests/models.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
from __future__ import absolute_import, unicode_literals
44

5-
from django.db import models
65
from django.conf import settings
6+
from django.db import models
77

88
from horizon.manager import HorizontalManager
9-
from horizon.models import (
10-
AbstractHorizontalMetadata,
11-
AbstractHorizontalModel,
12-
)
9+
from horizon.models import AbstractHorizontalMetadata, AbstractHorizontalModel
1310

1411

1512
class HorizontalMetadata(AbstractHorizontalMetadata):

0 commit comments

Comments
 (0)