[Python-modules-commits] [pyxb] 01/10: Convert from git-dpm to patches unapplied format

[Michael Fladischer]

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

fladi pushed a commit to branch debian/master
in repository pyxb.

commit 6188bfccbcdf971d442101cb26b3c70336eb1110
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Sep 25 22:00:13 2017 +0200

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm            | 11 -----------
 debian/gbp.conf            |  2 ++
 doc/_templates/layout.html |  2 ++
 doc/documentation.cfg      |  2 +-
 setup.py                   |  6 +-----
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index cee3e65..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-a46b41bce0a5839cffd6954b61c2153f671dd1c5
-a46b41bce0a5839cffd6954b61c2153f671dd1c5
-4c9d32a2aa60f5fd8e53bfe49c4c28d2b882f8e6
-4c9d32a2aa60f5fd8e53bfe49c4c28d2b882f8e6
-pyxb_1.2.5.orig.tar.gz
-8b915898e69bea2923bf09cf3c2b836d77876d33
-8810281
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 46e8ce2..c01b22f 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -1,4 +1,6 @@
 {% extends "!layout.html" %}
 {% block relbaritems %}
+    <li style="margin-left: 20px">PyXB hosted on <a href="http://sourceforge.net/projects/pyxb"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=263147&type=9"
+    width="80" height="15" alt="Get PyXB: Python XML Schema Bindings at SourceForge.net. Fast, secure and Free Open Source software downloads"/></a></li>
     {{ super() }}
 {% endblock %}
diff --git a/doc/documentation.cfg b/doc/documentation.cfg
index 246f5ef..eac6012 100644
--- a/doc/documentation.cfg
+++ b/doc/documentation.cfg
@@ -87,7 +87,7 @@ css: white
 # unspecified, the project link will be generated based on the
 # project's name and URL.
 # 20090820 pab: Satisfy SourceForge's branding requirements
-#link: PyXB hosted on <a href="http://sourceforge.net/projects/pyxb"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=263147&type=9" width="80" height="15" alt="Get PyXB: Python XML Schema Bindings at SourceForge.net. Fast, secure and Free Open Source software downloads"/></a>
+link: PyXB hosted on <a href="http://sourceforge.net/projects/pyxb"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=263147&type=9" width="80" height="15" alt="Get PyXB: Python XML Schema Bindings at SourceForge.net. Fast, secure and Free Open Source software downloads"/></a>
 
 # The "top" page for the documentation.  Can be a URL, the name
 # of a module or class, or one of the special names "trees.html",
diff --git a/setup.py b/setup.py
index d429ab7..4b94027 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,6 @@ import stat
 import re
 import datetime
 import logging
-import io
 
 from distutils.core import setup, Command
 
@@ -124,10 +123,7 @@ class test (Command):
                     number += 1
 
                 # Read the test source in and compile it
-                if sys.version_info > (3,):
-                    rv = compile(io.open(fn, encoding='utf-8').read(), test_name, 'exec')
-                else:
-                    rv = compile(open(fn).read(), test_name, 'exec')
+                rv = compile(open(fn).read(), test_name, 'exec')
                 state = 'evaluate'
 
                 # Make a copy of the globals array so we don't

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