[Python-modules-commits] [django-fsm] 07/10: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository django-fsm.

commit eeb5ec38c24ba806e797f7b9d648acc910b07d34
Merge: 2424f04 986992c
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Oct 16 11:16:28 2015 +0200

    merge patched into master

 .travis.yml                                        |   1 +
 README.md                                          | 394 -----------------
 README.rst                                         | 484 +++++++++++++++++++++
 debian/.git-dpm                                    |   6 +-
 debian/patches/remove_django_jenkins.patch         |  21 +-
 django_fsm/__init__.py                             |  67 ++-
 .../management/commands/graph_transitions.py       |  81 +++-
 django_fsm/tests/test_key_field.py                 |  12 +-
 setup.py                                           |   4 +-
 tests/settings.py                                  |   9 +-
 .../{initial_data.json => test_states_data.json}   |   0
 tests/testapp/models.py                            |   8 +
 tests/testapp/tests/test_custom_data.py            |   3 +
 tests/testapp/tests/test_exception_transitions.py  |   5 +-
 tests/testapp/tests/test_mixin_support.py          |  31 ++
 tests/testapp/tests/test_multidecorators.py        |  34 ++
 tests/testapp/tests/test_object_permissions.py     |  44 ++
 tests/testapp/tests/test_permissions.py            |   5 +
 .../tests/test_transition_all_except_target.py     |  31 ++
 tox.ini                                            |   9 +-
 20 files changed, 790 insertions(+), 459 deletions(-)

diff --cc debian/.git-dpm
index 43c55fb,0000000..1c3752c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 996e6d42afa20778e7ce62f63dc56e56a880b429
- 996e6d42afa20778e7ce62f63dc56e56a880b429
- 5f5423d4d9b8b666bf3fb139c335ed6ad993def1
++986992cfa7e6e407abb6aeb139d2cae3c0b0f417
++986992cfa7e6e407abb6aeb139d2cae3c0b0f417
++4165236913c0855fec34700027328bf5021aeb56
 +4165236913c0855fec34700027328bf5021aeb56
 +django-fsm_2.3.0.orig.tar.gz
 +6be8f4c546b23d9535dcef3a1d1a1caa88740d1e
 +19486
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_django_jenkins.patch
index 1ab9eda,0000000..2549778
mode 100644,000000..100644
--- a/debian/patches/remove_django_jenkins.patch
+++ b/debian/patches/remove_django_jenkins.patch
@@@ -1,36 -1,0 +1,27 @@@
- From 996e6d42afa20778e7ce62f63dc56e56a880b429 Mon Sep 17 00:00:00 2001
++From 986992cfa7e6e407abb6aeb139d2cae3c0b0f417 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Fri, 16 Oct 2015 11:10:35 +0200
 +Subject: Remove django-jenkins from test dependencies
 +
 + Upstream uses django-jenkins for test integration but it is optional in just
 + running the tests. This patch removes django-jenkins from the test
 + settings.py file.
 +Last-Update: 2015-06-24
 +Forwarded: not-needed
 +
 +Patch-Name: remove_django_jenkins.patch
 +---
-  tests/settings.py | 7 +------
-  1 file changed, 1 insertion(+), 6 deletions(-)
++ tests/settings.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/tests/settings.py b/tests/settings.py
- index 4363d79..ce14802 100644
++index 4163ff0..1664263 100644
 +--- a/tests/settings.py
 ++++ b/tests/settings.py
 +@@ -1,5 +1,5 @@
 + PROJECT_APPS = ('django_fsm', 'testapp',)
- -INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth', 'django_jenkins',) + PROJECT_APPS
- +INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth') + PROJECT_APPS
++-INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth', 'guardian', 'django_jenkins') + PROJECT_APPS
+++INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth', 'guardian') + PROJECT_APPS
 + DATABASE_ENGINE = 'sqlite3'
 + SECRET_KEY = 'nokey'
 + MIDDLEWARE_CLASSES = ()
- @@ -8,8 +8,3 @@ DATABASES = {
-          'ENGINE': 'django.db.backends.sqlite3',
-          }
-  }
- -
- -JENKINS_TASKS = (
- -    'django_jenkins.tasks.run_pep8',
- -    'django_jenkins.tasks.run_pyflakes'
- -)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-fsm.git