Merge pull request #24 from dipcode-software/feat/tests-evolution

srtab · web-flow · commit 5298d6d90f16 · 2017-09-16T01:30:20.000+01:00
now tests with various versions of python and django
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,46 @@
+sudo: false
 language: python
+
 python:
- - 2.7
-sudo: false
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
+env:
+  matrix:
+   - django19
+   - django110
+   - django111
+   - djangomaster
+
+matrix:
+  fast_finish: true
+  include:
+    - python: "3.4"
+      env: flake8
+  exclude:
+    - python: "2.7"
+      env: djangomaster
+    - python: "3.6"
+      env: django19
+    - python: "3.6"
+      env: django111
+  allow_failures:
+    - env: djangomaster
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $TRAVIS_BUILD_DIR/.tox
+
 install:
- - pip install tox
+  - pip install --upgrade pip wheel setuptools
+  - pip install coveralls codacy-coverage tox-travis
+
 script:
- - tox -e flake8
- - tox -e travis
+  - tox
+
+after_success:
+  - coveralls
+  - python-codacy-coverage -r coverage.xml
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -2,7 +2,7 @@
 
 We'd like to thank the following people for their contributions.
 
-- Paulo Truta <jpt@eurotux.com>
 - Sandro Rodrigues <srtabs@gmail.com>
 - Tiago Brito <tfb@eurotux.com>
 - Tiago Loureiro <tiagocostaloureiro@gmail.com>
+- Paulo Truta
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,5 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 0.1.0 - 2017-09-13
+## [0.1.1] - 2017-09-13
+### Added
+- Support to python 3.4, 3.5 and 3.6 and django 1.9, 1.10 and 1.11.
+
+## [0.1.0] - 2017-09-13
 - First release on PyPi
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,7 @@
+include AUTHORS.md
+include CHANGELOG.md
+include CODE_OF_CONDUCT.md
 include LICENSE
-include README.md
+include MANIFEST.in
+include README.rst
 recursive-include ajax_cbv/static *
diff --git a/README.rst b/README.rst
@@ -1,14 +1,21 @@
 Django Ajax CBV
 =================
 
-|Build Status| |Codacy Badge| |Coverage Status| |BCH compliance|
+|Build Status| |Codacy Badge| |Coverage Status| |BCH compliance| |Pypi|
 
 Django module to easily use generic Class Based views with ajax.
 
 Table of contents:
  * `How to install`_;
  * `License`_.
 
+Compatibility
+-------------
+Django
+ * 1.10
+ * 1.11
+ * latest
+
 How to install
 --------------
 
@@ -38,11 +45,13 @@ projects and commercial products.
 .. _How to install: #how-to-install
 .. _License: #license
 
-.. |Build Status| image:: https://travis-ci.org/dipcode-software/django-ajax-views.svg?branch=master
+.. |Build Status| image:: https://travis-ci.org/dipcode-software/django-ajax-cbv.svg?branch=master
    :target: https://travis-ci.org/dipcode-software/django-ajax-cbv
 .. |Codacy Badge| image:: https://api.codacy.com/project/badge/Grade/a64f03c2bd344561bc21e05c23aa04fb
    :target: https://www.codacy.com/app/srtabs/django-ajax-cbv?utm_source=github.com&utm_medium=referral&utm_content=dipcode-software/django-ajax-cbv&utm_campaign=Badge_Grade
 .. |Coverage Status| image:: https://coveralls.io/repos/github/dipcode-software/django-ajax-cbv/badge.svg?branch=master
    :target: https://coveralls.io/github/dipcode-software/django-ajax-cbv?branch=master
 .. |BCH compliance| image:: https://bettercodehub.com/edge/badge/dipcode-software/django-ajax-cbv?branch=master
    :target: https://bettercodehub.com/
+.. |Pypi| image:: https://img.shields.io/pypi/v/django-ajax-cbv.svg?style=flat-square
+   :target: https://pypi.python.org/pypi/django-ajax-cbv
diff --git a/ajax_cbv/__init__.py b/ajax_cbv/__init__.py
@@ -4,4 +4,4 @@
 
 default_app_config = 'ajax_cbv.apps.AjaxCBVConfig'
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
diff --git a/ajax_cbv/tests/test_mixins.py b/ajax_cbv/tests/test_mixins.py
@@ -27,15 +27,15 @@ def setUp(self):
 
     def test_response_no_action(self):
         response = self.object.json_to_response()
-        content = json.loads(response.content)
+        content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(content['action'], "nothing")
         self.assertEqual(content['status'], AjaxResponseStatus.SUCCESS)
 
     def test_response_with_action_refresh(self):
         response = self.object.json_to_response(
             action=AjaxResponseAction.REFRESH)
-        content = json.loads(response.content)
+        content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(content['action'], "refresh")
         self.assertEqual(content['status'], AjaxResponseStatus.SUCCESS)
@@ -44,7 +44,7 @@ def test_response_with_action_redirect(self):
         response = self.object.json_to_response(
             action=AjaxResponseAction.REDIRECT,
             success_url="/unit/test")
-        content = json.loads(response.content)
+        content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(content['action'], "redirect")
         self.assertEqual(content['status'], AjaxResponseStatus.SUCCESS)
@@ -87,7 +87,7 @@ def test_form_invalid_no_ajax(self):
     def test_form_invalid_as_ajax(self):
         self.view.request.is_ajax.return_value = True
         response = self.view.form_invalid(self.form)
-        content = json.loads(response.content)
+        content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(response.status_code, 400)
         self.assertEqual(content['action'], "nothing")
         self.assertEqual(content['status'], AjaxResponseStatus.ERROR)
@@ -100,7 +100,7 @@ def test_form_valid_no_ajax(self):
     def test_form_valid_as_ajax(self):
         self.view.request.is_ajax.return_value = True
         response = self.view.form_valid(self.form)
-        content = json.loads(response.content)
+        content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(content['action'], "nothing")
         self.assertEqual(content['status'], AjaxResponseStatus.SUCCESS)
@@ -159,7 +159,7 @@ def test_get_context_data_without_partial_title(self):
            return_value="<html></html>")
     def test_render_to_response(self, render_to_string):
         result = self.view.render_to_response({})
-        content = json.loads(result.content)
+        content = json.loads(result.content.decode("utf-8"))
         self.assertEqual(content['content'], "<html></html>")
         render_to_string.assert_called_with(
             "example.html", {}, request=self.view.request)
diff --git a/setup.py b/setup.py
@@ -83,12 +83,17 @@ class DevelopmentPublishCommand(PublishCommand):
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     cmdclass={
         'publish_dev': DevelopmentPublishCommand,
diff --git a/tox.ini b/tox.ini
@@ -1,39 +1,23 @@
 [tox]
 skipsdist = True
-envlist = py27,flake8
+envlist =
+    py{27,34,35}-django{19,110,111},
+    py{35,36}-django{111,master}
+    flake8
 
 [testenv]
-deps = -r{toxinidir}/requirements/tests.txt
-commands = {envpython} runtests.py
-
-[testenv:flake8]
-deps = flake8
-commands = flake8 {toxinidir}/ajax_cbv --exclude=*/migrations/*
-
-[testenv:coverage]
-deps=
-    -r{toxinidir}/requirements/tests.txt
-    coverage
-basepython=python2.7
-setenv=
-    PYTHONWARNINGS=ignore
-commands=
-    coverage run runtests.py {posargs:}
-    coverage report
-    coverage erase
-
-[testenv:travis]
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH CODACY_PROJECT_TOKEN
 deps =
-    -r{toxinidir}/requirements/tests.txt
     coverage
-    coveralls
-    codacy-coverage
-setenv =
-    PYTHONWARNINGS=ignore
-commands =
+    mock >= 2.0.0
+    django19: Django>=1.9,<1.10
+    django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<2.0
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
+commands=
     coverage run runtests.py {posargs:}
     coverage report
     coverage xml
-    coveralls
-    python-codacy-coverage -r coverage.xml
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 {toxinidir}/ajax_cbv

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`default_app_config = 'ajax_cbv.apps.AjaxCBVConfig'`
`6`	`6`
`7`		`-__version__ = '0.1.0'`
	`7`	`+__version__ = '0.1.1'`