Upversion Django to the latest, Add deprecation warning for 1.0 to be…

… removed in 3.0 (un33k#46)

* add deprecation warning, up version Django to latest, update travis.ci

* style fix

* drop 3.4 support for 2.1.3

.travis.yml

@@ -11,8 +11,8 @@ python:
   - "pypy3"
 
 env:
-  - DJANGO="django==2.0.4"
-  - DJANGO="django==1.11.12"
+  - DJANGO="django==2.1.3"
+  - DJANGO="django==1.11.16"
 
 install:
   - pip install $DJANGO
@@ -27,10 +27,12 @@ before_script:
 
 matrix:
   exclude:
-   - python: "2.7"
-     env: DJANGO="django==2.0.4"
-   - python: "pypy"
-     env: DJANGO="django==2.0.4"
+    - python: "3.4"
+      env: DJANGO="django==2.1.3"
+    - python: "2.7"
+      env: DJANGO="django==2.1.3"
+    - python: "pypy"
+      env: DJANGO="django==2.1.3"
 
 script: coverage run --source=ipware manage.py test
 

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "python.linting.enabled": false
+}

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.1.1
+
+Enhancement:
+  - Added deprecation warnings preparing for version 3.0
+  - Update to latest Django
+
 ## 2.1.0
 
 Enhancement:

README.md

@@ -222,3 +222,9 @@ X.Y.Z Version
 
 [download-image]: https://img.shields.io/pypi/dm/django-ipware.svg
 [download-link]: https://pypi.python.org/pypi/django-ipware
+
+
+Sponsors
+====================
+
+[![Surge](https://www.surgeforward.com/wp-content/themes/understrap-master/images/logo.png)](https://github.com/surgeforward)

ipware/__init__.py

@@ -5,4 +5,4 @@
 
 __author__ = 'Val Neekman @ Neekware Inc. [@vneekman]'
 __description__ = "A Django application to retrieve user's IP address"
-__version__ = '2.1.0'
+__version__ = '2.1.1'

ipware/ip.py

@@ -1,3 +1,5 @@
+import warnings
+
 from django.conf import settings
 
 from .utils import is_valid_ip
@@ -6,13 +8,16 @@
 NON_PUBLIC_IP_PREFIX = tuple([ip.lower() for ip in defs.IPWARE_NON_PUBLIC_IP_PREFIX])
 TRUSTED_PROXY_LIST = tuple([ip.lower() for ip in getattr(settings, 'IPWARE_TRUSTED_PROXY_LIST', [])])
 
+warnings.simplefilter('always', DeprecationWarning)
+
 
 def get_ip(request, real_ip_only=False, right_most_proxy=False):
     """
     Returns client's best-matched ip-address, or None
     @deprecated - Do not edit
     """
     best_matched_ip = None
+    warnings.warn('get_ip is deprecated and will be removed in 3.0.', DeprecationWarning)
     for key in defs.IPWARE_META_PRECEDENCE_ORDER:
         value = request.META.get(key, request.META.get(key.replace('_', '-'), '')).strip()
         if value is not None and value != '':
@@ -37,6 +42,7 @@ def get_real_ip(request, right_most_proxy=False):
     Returns client's best-matched `real` `externally-routable` ip-address, or None
     @deprecated - Do not edit
     """
+    warnings.warn('get_real_ip is deprecated and will be removed in 3.0.', DeprecationWarning)
     return get_ip(request, real_ip_only=True, right_most_proxy=right_most_proxy)
 
 
@@ -45,6 +51,7 @@ def get_trusted_ip(request, right_most_proxy=False, trusted_proxies=TRUSTED_PROX
     Returns client's ip-address from `trusted` proxy server(s) or None
     @deprecated - Do not edit
     """
+    warnings.warn('get_trusted_ip is deprecated and will be removed in 3.0.', DeprecationWarning)
     if trusted_proxies:
         meta_keys = ['HTTP_X_FORWARDED_FOR', 'X_FORWARDED_FOR']
         for key in meta_keys:

ipware/tests/tests_v1/tests_ipv4.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 
+import warnings
 from django.conf import settings
 from django.http import HttpRequest
 from django.test import TestCase
 from ipware.ip import get_ip
 from ipware.ip import get_real_ip
 from ipware.ip import get_trusted_ip
 
+warnings.simplefilter('ignore')
 
 class IPv4TestCase(TestCase):
     """IP address Test"""

ipware/tests/tests_v1/tests_ipv6.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import warnings
 from django.conf import settings
 from django.http import HttpRequest
 from django.test import TestCase
@@ -8,6 +9,7 @@
 from ipware.ip import get_real_ip
 from ipware.ip import get_trusted_ip
 
+warnings.simplefilter('ignore')
 
 class IPv6TestCase(TestCase):
     """IP address Test"""