Skip to content

Commit 4b58eb5

Browse files
authored
Merge pull request #43 from liminspace/develop
Added supporting Django v2.2
2 parents 9c42ac4 + ac4b122 commit 4b58eb5

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ env:
1212
- DJANGO_VERSION="<1.12"
1313
- DJANGO_VERSION="<2.1"
1414
- DJANGO_VERSION="<2.2"
15+
- DJANGO_VERSION="<2.3"
1516

1617
matrix:
1718
exclude:
1819
- { python: "2.7", env: DJANGO_VERSION="<2.1" }
1920
- { python: "2.7", env: DJANGO_VERSION="<2.2" }
21+
- { python: "2.7", env: DJANGO_VERSION="<2.3" }
2022

2123
install:
2224
- pip install "Django$DJANGO_VERSION"

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
1.2.0 (2018-08-07)
2+
==================
3+
* Added supporting Django v2.2
4+
5+
16
1.1.1 (2018-08-07)
27
==================
38
* Added supporting Django v2.1

privateurl/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
__version__ = '1.1.1'
1+
__version__ = '1.2.0'
22

33
default_app_config = 'privateurl.apps.PrivateURLConfig'

requirements_dev.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
pip==18.0
2-
setuptools==40.0.0
3-
wheel==0.31.1
4-
twine==1.11.0
1+
wheel==0.33.1
2+
twine==1.13.0
53

6-
coverage==4.5.1
7-
Django==2.1
8-
pytz==2018.5
4+
coverage==4.5.3
5+
Django==2.2
6+
pytz==2018.9
97

108
# for Py2
119
# pip install -U ndg-httpsclient

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
include_package_data=True,
1717
zip_safe=False, # because include static
1818
install_requires=[
19-
'django>=1.8,<2.2',
19+
'django>=1.8,<2.3',
2020
],
2121
keywords=[
2222
'django', 'url', 'private', 'private url', 'django-privateurl',

0 commit comments

Comments
 (0)