[Python-modules-commits] [django-fsm] 04/06: 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 570b03ec06558536bd3a53931ac11c38e2fb9326
Merge: e8d44dd 9b23c32
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri May 20 10:14:20 2016 +0200

    merge patched into master

 .checkignore                                       |   2 +
 .travis.yml                                        |  17 ++-
 CHANGELOG.rst                                      | 101 +++++++++++++++
 README.rst                                         | 137 ++++++---------------
 debian/.git-dpm                                    |   6 +-
 debian/patches/remove_django_jenkins.patch         |   2 +-
 django_fsm/__init__.py                             |  62 +++++++---
 .../management/commands/graph_transitions.py       |  11 +-
 django_fsm/tests/test_basic_transitions.py         |  87 ++++++++++++-
 setup.py                                           |   8 +-
 tests/testapp/models.py                            |   8 +-
 tests/testapp/tests/test_multi_resultstate.py      |  40 ++++++
 tests/testapp/tests/test_string_field_parameter.py |  32 +++++
 tox.ini                                            |  64 +++++-----
 14 files changed, 411 insertions(+), 166 deletions(-)

diff --cc debian/.git-dpm
index 0644f6c,0000000..0e5e432
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
- 986992cfa7e6e407abb6aeb139d2cae3c0b0f417
- 986992cfa7e6e407abb6aeb139d2cae3c0b0f417
- 4165236913c0855fec34700027328bf5021aeb56
++9b23c32f4778e6ae2d836ba3d7d0833a329e9380
++9b23c32f4778e6ae2d836ba3d7d0833a329e9380
++db9e9746e83da3f9dff579fecd3b8cb3193066b2
 +db9e9746e83da3f9dff579fecd3b8cb3193066b2
 +django-fsm_2.4.0.orig.tar.gz
 +3cb26484420fe06bd993d1b9d44e0476bfc3b5f8
 +20857
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_django_jenkins.patch
index 2549778,0000000..f132420
mode 100644,000000..100644
--- a/debian/patches/remove_django_jenkins.patch
+++ b/debian/patches/remove_django_jenkins.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 986992cfa7e6e407abb6aeb139d2cae3c0b0f417 Mon Sep 17 00:00:00 2001
++From 9b23c32f4778e6ae2d836ba3d7d0833a329e9380 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 | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/tests/settings.py b/tests/settings.py
 +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', 'guardian', 'django_jenkins') + PROJECT_APPS
 ++INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth', 'guardian') + PROJECT_APPS
 + DATABASE_ENGINE = 'sqlite3'
 + SECRET_KEY = 'nokey'
 + MIDDLEWARE_CLASSES = ()

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