Skip to content

Commit be4aa84

Browse files
authored
Merge pull request #15 from hsmett/update-python-django-support
Update Python & Django support
2 parents 0e21766 + d831c06 commit be4aa84

File tree

7 files changed

+42
-46
lines changed

7 files changed

+42
-46
lines changed

.travis.yml

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Config file for automatic testing at travis-ci.org
2+
dist: xenial
3+
24
language: python
35

46
services:
@@ -10,57 +12,45 @@ env:
1012
matrix:
1113
include:
1214
# Python version is just for the look on travis.
13-
- python: 2.7
14-
env: TOX_ENV=py27-django18
15-
16-
- python: 2.7
17-
env: TOX_ENV=py27-django19
18-
19-
- python: 2.7
20-
env: TOX_ENV=py27-django110
21-
2215
- python: 2.7
2316
env: TOX_ENV=py27-django111
2417

25-
- python: 2.7
26-
env: TOX_ENV=py27-djangostable
27-
28-
- python: 3.4
29-
env: TOX_ENV=py34-django18
18+
- python: 3.5
19+
env: TOX_ENV=py35-django111
3020

31-
- python: 3.4
32-
env: TOX_ENV=py34-django19
21+
- python: 3.6
22+
env: TOX_ENV=py36-django111
3323

34-
- python: 3.4
35-
env: TOX_ENV=py34-django110
24+
- python: 3.7
25+
env: TOX_ENV=py37-django111
3626

37-
- python: 3.4
38-
env: TOX_ENV=py34-django111
27+
- python: 3.5
28+
env: TOX_ENV=py35-django20
3929

40-
- python: 3.4
41-
env: TOX_ENV=py34-djangostable
30+
- python: 3.6
31+
env: TOX_ENV=py36-django20
4232

43-
- python: 3.5
44-
env: TOX_ENV=py35-django18
33+
- python: 3.7
34+
env: TOX_ENV=py37-django20
4535

4636
- python: 3.5
47-
env: TOX_ENV=py35-django19
37+
env: TOX_ENV=py35-django21
4838

49-
- python: 3.5
50-
env: TOX_ENV=py35-django110
39+
- python: 3.6
40+
env: TOX_ENV=py36-django21
5141

52-
- python: 3.5
53-
env: TOX_ENV=py35-django111
42+
- python: 3.7
43+
env: TOX_ENV=py37-django21
5444

5545
- python: 3.5
5646
env: TOX_ENV=py35-djangostable
5747

58-
- python: 3.6
59-
env: TOX_ENV=py36-django111
60-
6148
- python: 3.6
6249
env: TOX_ENV=py36-djangostable
6350

51+
- python: 3.7
52+
env: TOX_ENV=py37-djangostable
53+
6454
- env: TOX_ENV=linters
6555

6656
install:

CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Before you submit a pull request, check that it meets these guidelines:
100100
2. If the pull request adds functionality, the docs should be updated. Put
101101
your new functionality into a function with a docstring, and add the
102102
feature to the list in README.rst.
103-
3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check
103+
3. The pull request should work for Python 2.7, 3.5, 3.6 and 3.7. Check
104104
https://travis-ci.org/peopledoc/django-readonly-field/pull_requests
105105
and make sure that the tests pass for all supported Python versions.
106106

HISTORY.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ History
66
1.0.4 (unreleased)
77
++++++++++++++++++
88

9-
- Nothing changed yet.
9+
- Drop support of Python 3.4
10+
- Confirm support of Python 3.7
11+
- Drop support of Django 1.8
12+
- Drop support of Django 1.9
13+
- Drop support of Django 1.10
14+
- Confirm support of Django 2.0
15+
- Confirm support of Django 2.1
1016

1117

1218
1.0.3 (2018-04-26)

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Requirements
1919
------------
2020

2121
+ **Postgresql only**
22-
+ Django, obviously. v1.8+ (until proven otherwise)
23-
+ Running under Python 2.7 or 3.4+
22+
+ Django, obviously. v1.11+ (until proven otherwise)
23+
+ Running under Python 2.7 or 3.5+
2424

2525
Documentation
2626
-------------

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
django>=1.8
1+
django>=1.11
22
-e .

setup.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,26 @@
4242
'django_readonly_field',
4343
],
4444
include_package_data=True,
45-
install_requires=["Django>=1.8"],
45+
install_requires=["Django>=1.11"],
4646
tests_require=["tox"],
4747
license="MIT",
4848
zip_safe=False,
4949
keywords='django-readonly-field',
5050
classifiers=[
5151
'Development Status :: 5 - Production/Stable',
5252
'Framework :: Django',
53-
'Framework :: Django :: 1.8',
54-
'Framework :: Django :: 1.9',
55-
'Framework :: Django :: 1.10',
5653
'Framework :: Django :: 1.11',
5754
'Framework :: Django :: 2.0',
55+
'Framework :: Django :: 2.1',
5856
'Framework :: Django',
5957
'Intended Audience :: Developers',
6058
'License :: OSI Approved :: BSD License',
6159
'Natural Language :: English',
6260
'Programming Language :: Python :: 2',
6361
'Programming Language :: Python :: 2.7',
6462
'Programming Language :: Python :: 3',
65-
'Programming Language :: Python :: 3.4',
6663
'Programming Language :: Python :: 3.5',
6764
'Programming Language :: Python :: 3.6',
65+
'Programming Language :: Python :: 3.7',
6866
],
6967
)

tox.ini

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
[tox]
22
skipsdist = True
33
envlist =
4-
{py27,py34,py35}-django{18,19,110,111,stable},{py36}-django{111,stable},linters
4+
{py27,py35,py36,py37}-django111
5+
{py35,py36,py37}-django{20,21,stable}
6+
linters
57

68
[testenv]
79
passenv = DATABASE_URL COVERAGE
810
setenv =
911
PYTHONPATH = {toxinidir}:{toxinidir}/django_readonly_field
1012
commands =
1113
/usr/bin/find . -name '*.pyc' -delete
14+
python --version
1215
pip freeze -l
1316
python runtests.py
1417
deps =
15-
django18: Django>=1.8,<1.9
16-
django19: Django>=1.9,<1.10
17-
django110: Django>=1.10,<1.11
1818
django111: Django>=1.11,<2.0
19+
django20: Django>=2.0,<2.1
20+
django21: Django>=2.1,<2.2
1921
djangostable: Django
2022
-r{toxinidir}/requirements_test.txt
2123

0 commit comments

Comments
 (0)