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

[Brian May]

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

bam pushed a commit to branch master
in repository django-simple-captcha.

commit a3da33ff36e90b381448bedb37e010fce44410a9
Merge: 270dcd5 ca2d27e
Author: Brian May <bam at debian.org>
Date:   Thu Dec 3 08:00:35 2015 +1100

    merge patched into master

 .gitignore                                         |  10 -
 .pep8                                              |   3 -
 .travis.yml                                        |  22 ---
 CHANGES                                            |  11 ++
 MANIFEST.in                                        |   2 +-
 PKG-INFO                                           |  22 +++
 README.rst                                         |  14 +-
 captcha/__init__.py                                |   2 +-
 captcha/conf/settings.py                           |  12 +-
 captcha/fields.py                                  |  57 ++++--
 captcha/locale/en/LC_MESSAGES/django.po            |  30 +++
 captcha/templates/captcha/field.html               |   1 +
 captcha/templates/captcha/hidden_field.html        |   1 +
 captcha/templates/captcha/image.html               |   4 +
 captcha/templates/captcha/text_field.html          |   1 +
 captcha/tests/tests.py                             |  54 +++---
 captcha/tests/urls.py                              |  25 ++-
 captcha/tests/views.py                             |  11 +-
 captcha/urls.py                                    |   6 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/depends                             |  23 ---
 debian/patches/pillow                              |  10 +-
 debian/patches/series                              |   1 -
 django_simple_captcha.egg-info/PKG-INFO            |  22 +++
 django_simple_captcha.egg-info/SOURCES.txt         |  75 ++++++++
 .../dependency_links.txt                           |   1 +
 django_simple_captcha.egg-info/not-zip-safe        |   1 +
 django_simple_captcha.egg-info/requires.txt        |   3 +
 django_simple_captcha.egg-info/top_level.txt       |   2 +
 docs/Makefile                                      |  89 ---------
 docs/_static/captcha3.png                          | Bin 9633 -> 0 bytes
 docs/_static/dict.png                              | Bin 7859 -> 0 bytes
 docs/_static/math.png                              | Bin 7491 -> 0 bytes
 docs/_static/random_chars.png                      | Bin 8136 -> 0 bytes
 docs/advanced.rst                                  | 202 ---------------------
 docs/conf.py                                       | 198 --------------------
 docs/index.rst                                     |  41 -----
 docs/usage.rst                                     | 143 ---------------
 setup.cfg                                          |   6 +
 setup.py                                           |   6 +-
 testproject/.coveragerc                            |  10 -
 testproject/coverage.sh                            |   5 -
 testproject/settings.py                            |  29 ++-
 testproject/settings_17.py                         |  61 -------
 testproject/templates/home.html                    |  12 --
 tox.ini                                            |  66 -------
 46 files changed, 318 insertions(+), 982 deletions(-)

diff --cc debian/.git-dpm
index e7687c8,0000000..61e55a8
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
- b0a08018fc0a12978c5e17a547c411e00946bedc
- b0a08018fc0a12978c5e17a547c411e00946bedc
- 5058ba3ccc0b922585223efee73540971cae6cd0
++ca2d27ebb3f16ad6490814afaaedd48d42dd9ae9
++ca2d27ebb3f16ad6490814afaaedd48d42dd9ae9
++d88edf05e266f6f90d8eae0d9c06c1aff8fce76a
 +d88edf05e266f6f90d8eae0d9c06c1aff8fce76a
 +django-simple-captcha_0.4.8.orig.tar.gz
 +92d1a3321435beff187bd38316927bf270bad44c
 +66697
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/pillow
index f484480,0000000..05ad22b
mode 100644,000000..100644
--- a/debian/patches/pillow
+++ b/debian/patches/pillow
@@@ -1,29 -1,0 +1,29 @@@
- From b0a08018fc0a12978c5e17a547c411e00946bedc Mon Sep 17 00:00:00 2001
++From ca2d27ebb3f16ad6490814afaaedd48d42dd9ae9 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 08:57:07 -0700
 +Subject: pillow
 +
 +Patch-Name: pillow
 +---
 + setup.py | 6 ++----
 + 1 file changed, 2 insertions(+), 4 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 9c63800..4ab3b11 100644
++index 8ac4232..1f122e5 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -4,12 +4,10 @@ from captcha import pillow_required, get_version as get_captcha_version
 + install_requires = [
 +     'setuptools',
-      'six >=1.1.0',
- -    'Django >= 1.4'
- +    'Django >= 1.4',
++     'six >=1.2.0',
++-    'Django >= 1.7'
+++    'Django >= 1.7',
 ++    'Pillow >= 2.2.2',
 + ]
 + 
 +-if pillow_required():
 +-    install_requires.append('Pillow >=2.2.2')
 +-
 + setup(
 +     name='django-simple-captcha',
 +     version=get_captcha_version(),
diff --cc debian/patches/series
index 9e0f291,0000000..3868fb1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- depends
 +pillow

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