Merge pull request #106 from asherf/more-versions

Add support for more newer python & Django versions, run tests under supported versions.

Author: asherf

.travis.yml

@@ -1,11 +1,14 @@
+dist: xenial
 language: python
 python:
+  - "3.5"
   - "3.6"
+  - "3.7"
   - "2.7"
 env:
-  - DJANGO_VERSION=2.0
+  - DJANGO_VERSION=2.1
+  - DJANGO_VERSION=2.2
   - DJANGO_VERSION=1.11
-  - DJANGO_VERSION=1.8
 services:
   - memcached
   - redis
@@ -14,7 +17,13 @@ services:
 matrix:
   exclude:
     - python: "2.7"
-      env: DJANGO_VERSION=2.0
+      env: DJANGO_VERSION=2.1
+    - python: "2.7"
+      env: DJANGO_VERSION=2.2
+    - python: "3.7"
+      env: DJANGO_VERSION=1.11
+    - python: "3.6"
+      env: DJANGO_VERSION=1.11
 
 install:
   - pip install -r requirements.txt

README.md

@@ -10,7 +10,7 @@ Export Django monitoring metrics for Prometheus.io
 
 ### Requirements
 
-* Django >= 1.8
+* Django >= 1.11
 
 ### Installation
 

django_prometheus/db/backends/postgresql/base.py

@@ -6,11 +6,7 @@
 )
 
 import psycopg2.extensions
-
-if django.VERSION >= (1, 9):
-    from django.db.backends.postgresql import base
-else:
-    from django.db.backends.postgresql_psycopg2 import base
+from django.db.backends.postgresql import base
 
 
 class DatabaseFeatures(base.DatabaseFeatures):
@@ -31,7 +27,4 @@ def get_connection_params(self):
     def create_cursor(self, name=None):
         # cursor_factory is a kwarg to connect() so restore create_cursor()'s
         # default behavior
-        if django.VERSION >= (1, 11, 0):
-            return base.DatabaseWrapper.create_cursor(self, name=name)
-        else:
-            return base.DatabaseWrapper.create_cursor(self)
+        return base.DatabaseWrapper.create_cursor(self, name=name)

django_prometheus/middleware.py

@@ -1,12 +1,9 @@
 import django
+from django.utils.deprecation import MiddlewareMixin
 from prometheus_client import Counter, Histogram
 
 from django_prometheus.utils import Time, TimeSince, PowersOf
 
-if django.VERSION >= (1, 10, 0):
-    from django.utils.deprecation import MiddlewareMixin
-else:
-    MiddlewareMixin = object
 
 requests_total = Counter(
     'django_http_requests_before_middlewares_total',

django_prometheus/tests/end2end/testapp/settings.py

@@ -53,27 +53,21 @@
 
 
 def GetMiddlewareClasses():
-    classes = ['django_prometheus.middleware.PrometheusBeforeMiddleware']
-    classes.extend([
+    classes = [
+        'django_prometheus.middleware.PrometheusBeforeMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.middleware.common.CommonMiddleware',
         'django.middleware.csrf.CsrfViewMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware'])
-    if django.VERSION < (1, 10):
-        classes.append(
-            'django.contrib.auth.middleware.SessionAuthenticationMiddleware')
-    classes.extend([
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
-        'django.middleware.clickjacking.XFrameOptionsMiddleware'])
-    classes.append('django.middleware.security.SecurityMiddleware')
-    classes.append('django_prometheus.middleware.PrometheusAfterMiddleware')
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.middleware.security.SecurityMiddleware',
+        'django_prometheus.middleware.PrometheusAfterMiddleware',
+    ]
     return classes
 
 
-# For Django 1.x
-MIDDLEWARE_CLASSES = GetMiddlewareClasses()
-# For Django 2.x
-MIDDLEWARE = MIDDLEWARE_CLASSES
+MIDDLEWARE = GetMiddlewareClasses()
 
 ROOT_URLCONF = 'testapp.urls'
 

django_prometheus/tests/end2end/testapp/urls.py

@@ -4,10 +4,6 @@
 
 from testapp import views
 
-if django.VERSION >= (1, 9, 0):
-    admin_urls = admin.site.urls
-else:
-    admin_urls = include(admin.site.urls)
 
 urlpatterns = [
     url(r'^$', views.index),
@@ -18,5 +14,5 @@
     url(r'^newlawn/(?P<location>[a-zA-Z0-9 ]+)$', views.newlawn),
     url(r'^file$', views.file),
     url('', include('django_prometheus.urls')),
-    url(r'^admin/', admin_urls),
+    url(r'^admin/', admin.site.urls),
 ]

django_prometheus/urls.py

@@ -1,5 +1,4 @@
 from django.conf.urls import url
-
 from django_prometheus import exports
 
 urlpatterns = [

requirements.txt

@@ -1,8 +1,8 @@
-Django>=1.8
+Django>=1.11
 django-redis>=4.8
 pep8>=1.6.2
 prometheus-client>=0.7
-pip-prometheus>=1.1.0
+pip-prometheus>=1.2.1
 mock>=1.0.1
 mysqlclient<1.4
 psycopg2

setup.py

@@ -33,12 +33,12 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Framework :: Django",
+        "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.1",
+        "Framework :: Django :: 2.2",
         "Topic :: System :: Monitoring",
         "License :: OSI Approved :: Apache Software License",
     ],