[Python-modules-commits] [python-fedora] 04/09: merge patched into master
Sergio Durigan Junior
sergiodj-guest at moszumanska.debian.org
Tue Jul 19 23:50:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
sergiodj-guest pushed a commit to branch master
in repository python-fedora.
commit 9d43a0869dd486ad009cd03edf48ff66a2722514
Merge: 8ee134d e99bdf1
Author: Sergio Durigan Junior <sergiodj at sergiodj.net>
Date: Tue Jul 5 00:06:43 2016 -0400
merge patched into master
MANIFEST.in | 2 +-
NEWS | 142 ++++-
PKG-INFO | 7 +-
README => README.rst | 172 +++---
debian/.git-dpm | 6 +-
debian/patches/setuptools_workaround.diff | 26 +-
doc/api.rst | 2 +-
doc/client.rst | 29 +-
doc/existing.rst | 31 +-
doc/flask_fas_openid.rst | 1 -
fedora/accounts/__init__.py | 3 -
fedora/accounts/fas2.py | 12 -
fedora/client/__init__.py | 20 +-
fedora/client/baseclient.py | 26 +-
fedora/client/bodhi.py | 566 ++++++++++++++++--
fedora/client/fas2.py | 55 +-
fedora/client/openidbaseclient.py | 313 +++++-----
fedora/client/openidproxyclient.py | 44 +-
fedora/client/pkgdb.py | 731 ------------------------
fedora/client/proxyclient.py | 36 +-
fedora/client/wiki.py | 38 +-
fedora/compat25/__init__.py | 13 -
fedora/django/__init__.py | 2 -
fedora/django/auth/models.py | 14 +-
fedora/release.py | 10 +-
fedora/tg/identity/jsonfasprovider1.py | 2 +-
fedora/tg/identity/jsonfasprovider2.py | 16 +-
fedora/tg/utils.py | 15 +-
fedora/tg/widgets.py | 13 +-
fedora/tg2/utils.py | 16 +-
fedora/urlutils.py | 8 +-
fedora/wsgi/csrf.py | 10 +-
fedora/wsgi/faswho/faswhoplugin.py | 8 +-
flask_fas.py | 204 -------
flask_fas_openid.py | 75 ++-
python-fedora.spec | 313 ----------
python_fedora.egg-info/PKG-INFO | 7 +-
python_fedora.egg-info/SOURCES.txt | 87 ++-
python_fedora.egg-info/entry_points.txt | 10 +-
python_fedora.egg-info/requires.txt | 6 +-
python_fedora.egg-info/top_level.txt | 3 +-
releaseutils.py | 12 +-
setup.py | 25 +-
tests/__init__.py | 0
tests/functional/__init__.py | 0
tests/functional/functional_test_utils.py | 31 +
tests/functional/test_openidbaseclient.py | 62 ++
tests/test_urlutils.py | 53 ++
translations/{python-fedora.pot => af.po} | 29 +-
translations/{python-fedora.pot => am.po} | 29 +-
translations/{python-fedora.pot => anp.po} | 29 +-
translations/{python-fedora.pot => ar.po} | 29 +-
translations/{python-fedora.pot => as.po} | 29 +-
translations/{python-fedora.pot => ast.po} | 29 +-
translations/{python-fedora.pot => bal.po} | 29 +-
translations/{python-fedora.pot => be.po} | 29 +-
translations/{python-fedora.pot => bg.po} | 29 +-
translations/{python-fedora.pot => bn.po} | 29 +-
translations/{python-fedora.pot => bn_IN.po} | 29 +-
translations/{python-fedora.pot => bo.po} | 29 +-
translations/{python-fedora.pot => br.po} | 29 +-
translations/{python-fedora.pot => brx.po} | 29 +-
translations/{python-fedora.pot => bs.po} | 29 +-
translations/ca.po | 96 ++--
translations/cs.po | 38 +-
translations/{python-fedora.pot => cy.po} | 29 +-
translations/da.po | 74 ++-
translations/de.po | 76 ++-
translations/{python-fedora.pot => de_CH.po} | 29 +-
translations/{python-fedora.pot => el.po} | 29 +-
translations/{python-fedora.pot => en_GB.po} | 29 +-
translations/{python-fedora.pot => eo.po} | 29 +-
translations/es.po | 76 ++-
translations/{python-fedora.pot => et.po} | 29 +-
translations/{python-fedora.pot => eu.po} | 29 +-
translations/{python-fedora.pot => fa.po} | 29 +-
translations/{python-fedora.pot => fi.po} | 29 +-
translations/fr.po | 77 ++-
translations/{python-fedora.pot => gl.po} | 29 +-
translations/{python-fedora.pot => gu.po} | 29 +-
translations/{python-fedora.pot => he.po} | 29 +-
translations/{python-fedora.pot => hi.po} | 29 +-
translations/{python-fedora.pot => hr.po} | 29 +-
translations/hu.po | 70 ++-
translations/{python-fedora.pot => ia.po} | 29 +-
translations/id.po | 15 +-
translations/{python-fedora.pot => ilo.po} | 29 +-
translations/{python-fedora.pot => is.po} | 29 +-
translations/it.po | 75 ++-
translations/ja.po | 63 +-
translations/{python-fedora.pot => ka.po} | 29 +-
translations/{python-fedora.pot => kk.po} | 29 +-
translations/{python-fedora.pot => km.po} | 29 +-
translations/{python-fedora.pot => kn.po} | 29 +-
translations/{python-fedora.pot => ko.po} | 29 +-
translations/{python-fedora.pot => kw.po} | 29 +-
translations/{python-fedora.pot => kw at kkcor.po} | 29 +-
translations/{python-fedora.pot => kw at uccor.po} | 29 +-
translations/{python-fedora.pot => kw_GB.po} | 29 +-
translations/{python-fedora.pot => ky.po} | 29 +-
translations/{python-fedora.pot => lv.po} | 29 +-
translations/{python-fedora.pot => mai.po} | 29 +-
translations/{python-fedora.pot => mk.po} | 29 +-
translations/{python-fedora.pot => ml.po} | 29 +-
translations/{python-fedora.pot => mn.po} | 29 +-
translations/{python-fedora.pot => mr.po} | 29 +-
translations/{python-fedora.pot => ms.po} | 29 +-
translations/nb.po | 15 +-
translations/{python-fedora.pot => nds.po} | 29 +-
translations/{python-fedora.pot => ne.po} | 29 +-
translations/nl.po | 82 ++-
translations/{python-fedora.pot => nn.po} | 29 +-
translations/{python-fedora.pot => nso.po} | 29 +-
translations/{python-fedora.pot => or.po} | 29 +-
translations/{python-fedora.pot => pa.po} | 29 +-
translations/pl.po | 83 ++-
translations/pt.po | 48 +-
translations/pt_BR.po | 75 ++-
translations/python-fedora.pot | 24 +-
translations/{python-fedora.pot => ro.po} | 29 +-
translations/ru.po | 44 +-
translations/{python-fedora.pot => si.po} | 29 +-
translations/{python-fedora.pot => sk.po} | 29 +-
translations/{python-fedora.pot => sl.po} | 29 +-
translations/{python-fedora.pot => sq.po} | 29 +-
translations/{python-fedora.pot => sr.po} | 29 +-
translations/{id.po => sr at latin.po} | 17 +-
translations/sv.po | 74 ++-
translations/{python-fedora.pot => ta.po} | 29 +-
translations/{python-fedora.pot => te.po} | 29 +-
translations/{python-fedora.pot => tg.po} | 29 +-
translations/th.po | 62 +-
translations/tr.po | 48 +-
translations/{python-fedora.pot => tw.po} | 29 +-
translations/uk.po | 82 ++-
translations/{python-fedora.pot => ur.po} | 29 +-
translations/{python-fedora.pot => vi.po} | 29 +-
translations/{python-fedora.pot => wba.po} | 29 +-
translations/{python-fedora.pot => yo.po} | 29 +-
translations/zh_CN.po | 55 +-
translations/{python-fedora.pot => zh_HK.po} | 29 +-
translations/zh_TW.po | 40 +-
translations/{python-fedora.pot => zu.po} | 29 +-
143 files changed, 3194 insertions(+), 3551 deletions(-)
diff --cc debian/.git-dpm
index c253fde,0000000..54ed432
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
- fc6bf55d65c6ebee3446cb777921ecf10317a48e
- fc6bf55d65c6ebee3446cb777921ecf10317a48e
- 62ddb27267f41e5a18b4bb411309e65efd1aa807
++e99bdf1119abce6de9c0ffef8f019087137f70c4
++e99bdf1119abce6de9c0ffef8f019087137f70c4
++91f9079733044796c022325313868b95346c236b
+91f9079733044796c022325313868b95346c236b
+python-fedora_0.8.0.orig.tar.gz
+72ccadd57765b3f4ec966935dde570f9dbda4dd0
+163805
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/setuptools_workaround.diff
index c99575b,0000000..6ad1d4a
mode 100644,000000..100644
--- a/debian/patches/setuptools_workaround.diff
+++ b/debian/patches/setuptools_workaround.diff
@@@ -1,45 -1,0 +1,31 @@@
- From fc6bf55d65c6ebee3446cb777921ecf10317a48e Mon Sep 17 00:00:00 2001
++From e99bdf1119abce6de9c0ffef8f019087137f70c4 Mon Sep 17 00:00:00 2001
+From: Scott Kitterman <scott at kitterman.com>
+Date: Thu, 8 Oct 2015 12:03:40 -0700
+Subject: Work around broken setuptools
+
+ * Patch setup.py to use distutils setup as a workaround for problems with
+ python-setuptools > 17 (Closes: #789982)
+Bug-Debian: http://bugs.debian.org/789982
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2015-07-23
+
+Patch-Name: setuptools_workaround.diff
+---
- setup.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
- index aca5ede..a4d1749 100755
++index be0f27e..f4bd066 100755
+--- a/setup.py
++++ b/setup.py
- @@ -1,7 +1,7 @@
- #!/usr/bin/python -tt
++@@ -3,7 +3,8 @@ import sys
+
- # Work around setuptools multi-version silliness
- -try:
- +"""try:
- __requires__ = ['CherryPy < 3', 'Sphinx >= 1.0']
- import pkg_resources
- except:
- @@ -9,11 +9,12 @@ except:
- # *sigh* setuptools is such a broken implementation
- # When setuptools is imported later, it will see the CherryPy requirement
- # and barf. So we have to delete it here.
- - del __requires__
- + del __requires__"""
-
- execfile("fedora/release.py")
++ exec(compile(open("fedora/release.py").read(), "fedora/release.py", 'exec'))
+
+-from setuptools import find_packages, setup
++from setuptools import find_packages
++from distutils.core import setup
+
+ setup(
+ name=NAME,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-fedora.git
More information about the Python-modules-commits
mailing list