[Python-modules-commits] [python-pyramid] 05/06: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-pyramid.

commit 63c2f58a6ed964af7f12088e111f8d3d902bbd88
Merge: de8cda8 5207dc6
Author: Barry Warsaw <barry at python.org>
Date:   Fri Oct 30 10:27:24 2015 -0400

    merge patched into master

 .gitignore                                 |   1 +
 .gitmodules                                |   3 -
 .travis.yml                                |   2 +
 CHANGES.txt                                | 107 +++-
 CONTRIBUTORS.txt                           |   4 +
 HACKING.txt                                |   1 +
 PKG-INFO                                   | 845 ++++++++++++++++++++++++++++-
 README.rst                                 |   7 +
 RELEASING.txt                              |   6 +
 debian/.git-dpm                            |   6 +-
 debian/patches/tweak-requirements.patch    |   4 +-
 pyramid.egg-info/PKG-INFO                  | 845 ++++++++++++++++++++++++++++-
 pyramid.egg-info/SOURCES.txt               |   8 +-
 pyramid.egg-info/requires.txt              |   7 +-
 pyramid/config/routes.py                   |   6 +
 pyramid/config/views.py                    |   4 -
 pyramid/interfaces.py                      |   8 +-
 pyramid/path.py                            |  10 +-
 pyramid/renderers.py                       |  32 +-
 pyramid/response.py                        |  10 +-
 pyramid/scripts/proutes.py                 | 380 +++++++++++--
 pyramid/scripts/pserve.py                  |  33 ++
 pyramid/security.py                        |  14 +-
 pyramid/session.py                         |   4 +-
 pyramid/tests/test_renderers.py            |  26 +-
 pyramid/tests/test_response.py             |  32 +-
 pyramid/tests/test_scripts/dummy.py        |   2 +-
 pyramid/tests/test_scripts/test_proutes.py | 618 ++++++++++++++++++++-
 pyramid/tests/test_wsgi.py                 |   6 +
 pyramid/url.py                             |   4 +-
 pyramid/urldispatch.py                     |   9 +-
 pyramid/wsgi.py                            |   7 +
 rtd.txt                                    |   5 +-
 setup.cfg                                  |   2 +-
 setup.py                                   |   8 +-
 35 files changed, 2951 insertions(+), 115 deletions(-)

diff --cc debian/.git-dpm
index 92f68e6,0000000..38d83b7
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
- 549fe0a4ebd2ee70267e0bea67f71838d4acf98a
- 549fe0a4ebd2ee70267e0bea67f71838d4acf98a
- a59115ae72d93f9dcc232398185adff48a330102
++5207dc6e5001215d7c1963b9df52e4450b652b6c
++5207dc6e5001215d7c1963b9df52e4450b652b6c
++e356bfbd4749ea0bc4c5bb1af9b2ca1dfc4e06aa
 +e356bfbd4749ea0bc4c5bb1af9b2ca1dfc4e06aa
 +python-pyramid_1.5.7+dfsg.orig.tar.gz
 +2ad5e5a68a8ea6dfec47c1b583b5c0bbd27e530b
 +612672
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/tweak-requirements.patch
index 6e5bf3a,0000000..5dbe1fc
mode 100644,000000..100644
--- a/debian/patches/tweak-requirements.patch
+++ b/debian/patches/tweak-requirements.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 549fe0a4ebd2ee70267e0bea67f71838d4acf98a Mon Sep 17 00:00:00 2001
++From 5207dc6e5001215d7c1963b9df52e4450b652b6c Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Thu, 8 Oct 2015 12:48:00 -0700
 +Subject: Comment out some requirements that can't be satisfied
 +
 + automatically from installed packages or debian/py{,3}dist-override files.
 + It's okay because our Build-Depends will take care of it.
 +Forwarded: not-needed
 +
 +Patch-Name: tweak-requirements.patch
 +---
 + setup.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 32ed39d..29200a9 100644
++index 6f7b79f..fecb338 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -39,7 +39,7 @@ except IOError:
 + 
 + install_requires=[
 +     'setuptools',
 +-    'WebOb >= 1.3.1', # request.domain and CookieProfile
 ++    #'WebOb >= 1.3.1', # request.domain and CookieProfile
 +     'repoze.lru >= 0.4', # py3 compat
 +     'zope.interface >= 3.8.0',  # has zope.interface.registry
 +     'zope.deprecation >= 3.5.0', # py3 compat
 +@@ -49,7 +49,7 @@ install_requires=[
 +     ]
 + 
 + tests_require = [
 +-    'WebTest >= 1.3.1', # py3 compat
 ++    #'WebTest >= 1.3.1', # py3 compat
 +     ]
 + 
 + if not PY3:

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