Merge pull request #133 from itbabu/django19

Add support for Django 1.9 and Python 3.5
makinacorpus · Jan 4, 2016 · a64bd6b · a64bd6b
2 parents d73d88a + 230aed2
commit a64bd6b
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,37 +4,68 @@ python:
   - 2.7
   - 3.3
   - 3.4
+  - 3.5
 
 env:
   matrix:
-  - DJANGO_VERSION=1.4.15 DATABASE=sqlite
-  - DJANGO_VERSION=1.6 DATABASE=postgres
-  - DJANGO_VERSION=1.6 DATABASE=sqlite
-  - DJANGO_VERSION=1.7 DATABASE=postgres
-  - DJANGO_VERSION=1.7 DATABASE=sqlite
-  - DJANGO_VERSION=1.8 DATABASE=postgres
-  - DJANGO_VERSION=1.8 DATABASE=sqlite
+  - DJANGO_VERSION=1.4.22 DATABASE=sqlite
+  - DJANGO_VERSION=1.6.11 DATABASE=postgres
+  - DJANGO_VERSION=1.6.11 DATABASE=sqlite
+  - DJANGO_VERSION=1.7.11 DATABASE=postgres
+  - DJANGO_VERSION=1.7.11 DATABASE=sqlite
+  - DJANGO_VERSION=1.8.7 DATABASE=postgres
+  - DJANGO_VERSION=1.8.7 DATABASE=sqlite
+  - DJANGO_VERSION=1.9 DATABASE=postgres
+  - DJANGO_VERSION=1.9 DATABASE=sqlite
   - DJANGO_VERSION=dev DATABASE=postgres
   - DJANGO_VERSION=dev DATABASE=sqlite
 
 matrix:
   exclude:
     - python: 3.3
-      env: DJANGO_VERSION=1.4.15 DATABASE=sqlite
+      env: DJANGO_VERSION=1.4.22 DATABASE=sqlite
+    - python: 3.3
+      env: DJANGO_VERSION=1.4.22 DATABASE=postgres
+    - python: 3.4
+      env: DJANGO_VERSION=1.4.22 DATABASE=sqlite
     - python: 3.4
-      env: DJANGO_VERSION=1.4.15 DATABASE=sqlite
+      env: DJANGO_VERSION=1.4.22 DATABASE=postgres
+    - python: 3.5
+      env: DJANGO_VERSION=1.4.22 DATABASE=sqlite
+    - python: 3.5
+      env: DJANGO_VERSION=1.4.22 DATABASE=postgres
     - python: 3.3
-      env: DJANGO_VERSION=1.6 DATABASE=sqlite
-
-  allow_failures:
+      env: DJANGO_VERSION=1.6.11 DATABASE=sqlite
     - python: 3.4
-      env: DJANGO_VERSION=dev DATABASE=sqlite
+      env: DJANGO_VERSION=1.6.11 DATABASE=sqlite
     - python: 3.4
-      env: DJANGO_VERSION=dev DATABASE=postgres
+      env: DJANGO_VERSION=1.6.11 DATABASE=postgres
+    - python: 3.5
+      env: DJANGO_VERSION=1.6.11 DATABASE=sqlite
+    - python: 3.5
+      env: DJANGO_VERSION=1.6.11 DATABASE=postgres
+    - python: 3.5
+      env: DJANGO_VERSION=1.7.11 DATABASE=sqlite
+    - python: 3.5
+      env: DJANGO_VERSION=1.7.11 DATABASE=postgres
+    - python: 3.3
+      env: DJANGO_VERSION=1.9 DATABASE=sqlite
+    - python: 3.3
+      env: DJANGO_VERSION=1.9 DATABASE=postgres
     - python: 3.3
       env: DJANGO_VERSION=dev DATABASE=sqlite
     - python: 3.3
       env: DJANGO_VERSION=dev DATABASE=postgres
+
+  allow_failures:
+    - python: 3.5
+      env: DJANGO_VERSION=dev DATABASE=sqlite
+    - python: 3.5
+      env: DJANGO_VERSION=dev DATABASE=postgres
+    - python: 3.4
+      env: DJANGO_VERSION=dev DATABASE=sqlite
+    - python: 3.4
+      env: DJANGO_VERSION=dev DATABASE=postgres
     - python: 2.7
       env: DJANGO_VERSION=dev DATABASE=sqlite
     - python: 2.7

diff --git a/setup.py b/setup.py
@@ -9,27 +9,30 @@
     requires += ['ordereddict']
 
 setup(
-    name='django-leaflet',
-    version='0.17.2.dev0',
-    author='Mathieu Leplatre',
-    author_email='mathieu.leplatre@makina-corpus.com',
-    url='https://github.com/makinacorpus/django-leaflet',
-    download_url = "http://pypi.python.org/pypi/django-leaflet/",
-    description="Use Leaflet in your django projects",
-    long_description=open(os.path.join(here, 'README.rst')).read() + '\n\n' +
-                     open(os.path.join(here, 'CHANGES')).read(),
-    license='LPGL, see LICENSE file.',
-    install_requires=requires,
-    packages=find_packages(),
-    include_package_data = True,
-    zip_safe = False,
-    classifiers  = ['Topic :: Utilities',
-                    'Natural Language :: English',
-                    'Operating System :: OS Independent',
-                    'Intended Audience :: Developers',
-                    'Environment :: Web Environment',
-                    'Framework :: Django',
-                    'Development Status :: 5 - Production/Stable',
-                    'Programming Language :: Python :: 2.7',
-                    'Programming Language :: Python :: 3.3'],
+        name='django-leaflet',
+        version='0.17.2.dev0',
+        author='Mathieu Leplatre',
+        author_email='mathieu.leplatre@makina-corpus.com',
+        url='https://github.com/makinacorpus/django-leaflet',
+        download_url="http://pypi.python.org/pypi/django-leaflet/",
+        description="Use Leaflet in your django projects",
+        long_description=open(
+            os.path.join(here, 'README.rst')).read() + '\n\n' +
+                         open(os.path.join(here, 'CHANGES')).read(),
+        license='LPGL, see LICENSE file.',
+        install_requires=requires,
+        packages=find_packages(),
+        include_package_data=True,
+        zip_safe=False,
+        classifiers=['Topic :: Utilities',
+                     'Natural Language :: English',
+                     'Operating System :: OS Independent',
+                     'Intended Audience :: Developers',
+                     'Environment :: Web Environment',
+                     'Framework :: Django',
+                     'Development Status :: 5 - Production/Stable',
+                     'Programming Language :: Python :: 2.7',
+                     'Programming Language :: Python :: 3.3',
+                     'Programming Language :: Python :: 3.4',
+                     'Programming Language :: Python :: 3.5'],
 )