[Python-modules-commits] [python-xlrd] 04/09: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-xlrd.

commit 1de4de80808a3d33c0e3979a6a525519d93c75a0
Merge: 925c5da b52f5d5
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Jul 3 19:52:53 2016 +0200

    merge patched into master

 .gitignore                                         |   15 +
 .travis.yml                                        |   32 +
 HISTORY.html                                       |  339 +++++
 MANIFEST.in                                        |    2 +
 PKG-INFO                                           |    2 +-
 README.html                                        |  135 --
 README.md                                          |   82 ++
 build.txt                                          |   12 +
 debian/.git-dpm                                    |    6 +-
 debian/patches/disable-non-working-tests.patch     |   32 -
 debian/patches/series                              |    1 -
 .../setup-dont-include-doc-and-examples.patch      |    6 +-
 make_doc.bat                                       |    6 +
 pkg_doc.py                                         |   31 +
 pythondoc.py                                       | 1428 ++++++++++++++++++++
 requirements.txt                                   |   15 +
 setup.cfg                                          |    5 +
 setup.py                                           |    9 +-
 tests/apachepoi_52348.xlsx                         |  Bin 0 -> 5292 bytes
 tests/biff4_no_format_no_window2.xls               |  Bin 0 -> 2810 bytes
 tests/issue150.xlsx                                |  Bin 0 -> 99016 bytes
 tests/issue85.xls                                  |  Bin 0 -> 9090560 bytes
 tests/test_cell.py                                 |   10 +
 tests/test_comments_excel_sheet2.xlsx              |  Bin 0 -> 32180 bytes
 tests/test_missing_records.py                      |   22 +
 tests/test_open_workbook.py                        |   18 +-
 tests/test_sheet.py                                |   12 +
 tests/test_xlsx_comments.py                        |    9 +
 tests/test_xlsx_parse.py                           |   31 +
 tox.ini                                            |   13 +
 PKG-INFO => xlrd.egg-info/PKG-INFO                 |    2 +-
 xlrd.egg-info/SOURCES.txt                          |   67 +
 xlrd.egg-info/dependency_links.txt                 |    1 +
 xlrd.egg-info/top_level.txt                        |    1 +
 xlrd/__init__.py                                   |    8 +-
 xlrd/compdoc.py                                    |    8 +-
 xlrd/formatting.py                                 |   14 +-
 xlrd/info.py                                       |    2 +-
 xlrd/sheet.py                                      |   32 +-
 xlrd/xlsx.py                                       |   78 +-
 40 files changed, 2252 insertions(+), 234 deletions(-)

diff --cc debian/.git-dpm
index be7f3a6,0000000..74e7e88
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
- 060de5db928f03a11eae6f0064e3a0959595fd47
- 060de5db928f03a11eae6f0064e3a0959595fd47
- cc258051cea95102965d53294b1b11848de98a1f
++b52f5d5ddbada6222cb96da9cd9ec30dd77ecc3e
++b52f5d5ddbada6222cb96da9cd9ec30dd77ecc3e
++f69908a2e1d3f0830935125b170fc1d556308fd8
 +f69908a2e1d3f0830935125b170fc1d556308fd8
 +python-xlrd_1.0.0.orig.tar.gz
 +27ff32873b4d3f18814e0f4e14bcb5b4fb6a711a
 +2563654
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 38f553e,0000000..45cc3fe
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +setup-dont-include-doc-and-examples.patch
- disable-non-working-tests.patch
diff --cc debian/patches/setup-dont-include-doc-and-examples.patch
index 9163021,0000000..c211e08
mode 100644,000000..100644
--- a/debian/patches/setup-dont-include-doc-and-examples.patch
+++ b/debian/patches/setup-dont-include-doc-and-examples.patch
@@@ -1,31 -1,0 +1,31 @@@
- From e59bd586a818eece615fd8faf8648fe8d08acf33 Mon Sep 17 00:00:00 2001
++From b52f5d5ddbada6222cb96da9cd9ec30dd77ecc3e Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 13:26:54 -0700
 +Subject: setup-dont-include-doc-and-examples
 +
 +Don't install documentation and examples.
 +
 +Patch-Name: setup-dont-include-doc-and-examples.patch
 +---
 + setup.py | 8 --------
 + 1 file changed, 8 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index c563faf..fdfa653 100644
++index 3a1b2cb1c19d..6877dd20e12f 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -27,14 +27,6 @@ setup(
++@@ -22,14 +22,6 @@ setup(
 +     scripts = [
 +         'scripts/runxlrd.py',
 +         ],
 +-    package_data={
 +-            'xlrd': [
 +-                'doc/*.htm*',
 +-                # 'doc/*.txt',
 +-                'examples/*.*',
 +-                ],
 +-
 +-            },
 +     description = 'Library for developers to extract data from Microsoft Excel (tm) spreadsheet files',
 +     long_description = \
 +         "Extract data from Excel spreadsheets (.xls and .xlsx, versions 2.0 onwards) on any platform. " \

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