Bug#923771: unblock pre-approval: pandas/0.23.3+dfsg-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
This is subject to it actually working, as I haven't yet had time to
fully test it (given what brought me to this point, if you ask for
changes it would be preferable to test the actual final version).
Changes since testing, starting with the ones most open to discussion:
* Add d/upstream/metadata.
Should this be included or not?
* Fix documentation build (Sphinx now defaults to Python 3).
(Closes: #804552, LP: #1803018)
Important bug (the documentation wasn't being shipped at all). This is
not a complete fix: would you like me to go further or is now not the time?
- The 'Styling' documentation page
(http://pandas.pydata.org/pandas-docs/version/0.23/style.html) is
missing as it is in a different source format, that requires Pandoc
- Several examples (run at build time) contain exception messages
because their dependencies aren't installed
* Fix DataFrame @ np.array matrix multiplication. (Closes:
#918206)(Closes: #923707)
RC bug as it fails tests
* Make np.array @ Series act the right way round. (Closes: #923708)
Important (possibly RC) bug as it can give silently wrong answers
* Update d/copyright.
* Remove unlicensed files.
* Don't fail the build on +dfsg versions.
These are removed from orig.tar.gz as possible copyright violations:
pandas/tests/io/data/computer_sales_page.html
pandas/tests/io/data/macau.html
pandas/tests/io/data/nyse_wsj.html
Appear to be copies of unidentified web pages, only used as test data
for HTML table parsing.
scripts/find_commits_touching_func.py
scripts/merge-pr.py
One has a copyright notice and no license notice, other has a license
that refers to a NOTICE file that doesn't exist. Only used as upstream
release scripts.
/debian changes:
diff --git a/debian/changelog b/debian/changelog
index af29bf207..bb24569f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+pandas (0.23.3+dfsg-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Make np.array @ Series act the right way round. (Closes: #923708)
+ * Replace #918206 fix with a fix that doesn't change the return type
+ and inplace-ness of np.array += DataFrame. (Closes: #923707)
+ * Revert "Add documentation examples dependencies" to comply with
+ freeze policy.
+
+ -- Rebecca N. Palmer <rebecca_palmer@zoho.com> Mon, 04 Mar 2019
21:59:43 +0000
+
+pandas (0.23.3+dfsg-2) unstable; urgency=medium
+
+ * Team upload.
+ * Don't fail the build on +dfsg versions.
+ * Fix another d/copyright issue.
+ * Add d/upstream/metadata.
+
+ -- Rebecca N. Palmer <rebecca_palmer@zoho.com> Sat, 02 Mar 2019
14:57:12 +0000
+
+pandas (0.23.3+dfsg-1) unstable; urgency=medium
+
+ * Team upload.
+ * Fix DataFrame @ np.array matrix multiplication. (Closes: #918206)
+ * Fix documentation build (Sphinx now defaults to Python 3).
+ (Closes: #804552, LP: #1803018)
+ * Add documentation examples dependencies.
+ * Update d/copyright.
+ * Remove unlicensed files.
+
+ -- Rebecca N. Palmer <rebecca_palmer@zoho.com> Fri, 01 Mar 2019
23:02:18 +0000
+
pandas (0.23.3-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index 5e0cc68e5..a7b429d6a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
python-html5lib,
python-lxml,
python-matplotlib [!hurd-i386],
- python-nbsphinx | python-sphinx (<= 1.4),
+ python3-nbsphinx | python3-sphinx (<= 1.4),
python-nose,
python-numpy (>= 1:1.7~),
python-openpyxl,
@@ -52,7 +52,7 @@ Build-Depends: debhelper (>= 9),
xauth,
xclip,
Build-Depends-Indep:
- ipython (>= 0.12) | ipython2x | ipython1x,
+ ipython3,
Build-Conflicts: python-tables (= 3.3.0-4), python3-tables (= 3.3.0-4)
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.2
diff --git a/debian/copyright b/debian/copyright
index 44fe4c3ce..0c55442e2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,49 +1,111 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pandas
-Upstream-Contact: Wes McKinney <wesmckinn@gmail.com>
-Source-Location: http://github.com/wesm/pandas
+Upstream-Contact: pandas-dev@python.org
+Source: https://github.com/pandas-dev/pandas
+Files-Excluded: pandas/tests/io/data/computer_sales_page.html
+ pandas/tests/io/data/macau.html
+ pandas/tests/io/data/nyse_wsj.html
+ scripts/find_commits_touching_func.py
+ scripts/merge-pr.py
+Comment: I am not certain whether the above are actually a problem, but
this close to freeze it's easiest to just remove them
+
Files: *
Copyright: 2008-2011 AQR Capital Management, LLC
2011 Wes McKinney and pandas developers
- 2011-2013, Lambda Foundry, Inc. and PyData Development Team
+ 2011-2018 Lambda Foundry, Inc. and PyData Development Team
License: BSD-3
-Files: pandas/io/auth.py
-Copyright: 2012, Google Inc.
-License: Apache
-
-Files: pandas/src/datetime
+Files: pandas/_libs/src/datetime/*
Copyright: 2005-2013, NumPy Developers
License: BSD-3
Origin: numpy
Comment: Listed as derived from Numpy 1.7
-Files: pandas/src/headers/ms_*
-Copyright: 2006, Alexander Chemeris
+Files: pandas/_libs/skiplist.pyx
+ pandas/_libs/src/skiplist.h
+Copyright: 2009, Raymond Hettinger
+ 2011-2018 Wes McKinney and PyData Development Team
+License: Expat and BSD-3
+Origin: http://code.activestate.com/recipes/576930/
+Comment: it is a Cython code "inspired" by the original Python code by
Raymond
+
+Files: pandas/_libs/src/headers/ms_*
+Copyright: 2006-2008 Alexander Chemeris
License: BSD-3
-Files: pandas/src/klib
+Files: pandas/_libs/src/klib/*
Copyright: 2008, 2009, 2011 by Attractive Chaos <attractor@live.co.uk>
License: Expat
-Files: pandas/src/skiplist.pyx
-Copyright: 2009, Raymond Hettinger
+Files: pandas/_libs/src/msgpack/*
+Copyright: 2008-2011 FURUHASHI Sadayuki and Naoki INADA
+License: Apache
+
+Files: pandas/_libs/src/parser/tokenizer.*
+Copyright: 2002 Michael Ringgaard
+ 2011-2012 Warren Weckesser
+ 2001-2012 Python Software Foundation and Python contributors
+ 2012-2018 Lambda Foundry, Inc. and PyData Development Team
+License: Python and BSD-3
+Origin: csv (Python standard library),
github.com/WarrenWeckesser/textreader
+
+Files: pandas/_libs/src/ujson/*
+Copyright: 1988-1993 The Regents of the University of California
+ 1994 Sun Microsystems, Inc.
+ 2007 Nick Galbreath
+ 2011-2013 ESN Social Software AB and Jonas Tarnstrom
+ 2012-2018 Lambda Foundry, Inc. and PyData Development Team
+License: BSD-3 and Expat
+Origin: ultrajson
+
+Files: pandas/compat/*
+Copyright: 2010-2013 Benjamin Peterson
+ 2012-2018 Lambda Foundry, Inc. and PyData Development Team
+License: Expat and BSD-3
+Origin: six
+
+Files: pandas/core/window.py
+Copyright: 2010-2012 Archipel Asset Management AB
+ 2011-2018 Lambda Foundry, Inc. and PyData Development Team
+License: BSD-3
+Comment: unclear if actual copying from bottleneck has taken place;
assuming it has to be safe. Original was BSD-2, but BSD-2 and BSD-3 = BSD-3
+
+Files: pandas/io/packers.py
+ pandas/tests/io/test_packers.py
+Copyright: 2013 Lev Givon
+ 2013-2018 Lambda Foundry, Inc. and PyData Development Team
+License: BSD-3
+
+Files: pandas/io/sas/sas7bdat.py
+Copyright: 2015 Jared Hobbs
+ 2016-2018 Lambda Foundry, Inc. and PyData Development Team
+Origin: https://bitbucket.org/jaredhobbs/sas7bdat
License: Expat
-Origin: http://code.activestate.com/recipes/576930/
-Comment: it is a Cython code "inspired" by the original Python code by
Raymond
-Files: pandas/util/clipboard.py
-Copyright: 2010, Albert Sweigart <al@coffeeghost.net>
+Files: pandas/io/clipboard/*
+Copyright: 2010-2017 Albert Sweigart and Pyperclip contributors
+ 2016-2018 Lambda Foundry, Inc. and PyData Development Team
License: BSD-3
-Origin: Pyperclip v1.3
+Origin: Pyperclip
-Files: scripts/git-mrb
-Copyright: 2011-2012, Fernando Perez <Fernando.Perez@berkeley.edu>
-Origin: IPython
+Files: pandas/tests/io/data/banklist.html
+ pandas/tests/io/data/banklist.csv
+ pandas/tests/io/data/spam.html
+Copyright: None; by Federal Deposit Insurance Corporation and US
Department of Agriculture
+License: public-domain
+
+Files: pandas/tests/io/data/wikipedia_states.html
+Copyright: 2002-2014 Wikipedia contributors (full list:
https://en.wikipedia.org/w/index.php?title=List_of_U.S._states_and_territories_by_area&offset=20140630&action=history)
+License: CC-BY-SA-3.0
+
+Files: scripts/announce.py
+Copyright: 2001-2017 Enthought, Inc. and SciPy Developers.
+ 2017-2018 Lambda Foundry, Inc. and PyData Development Team
License: BSD-3
+Comment: it is possible that other code was also taken from Scipy
-Files: doc/source/themes/agogo/*
+Files: doc/source/themes/nature_with_gtoc/*
Copyright: 2007-2011 by the Sphinx team
License: BSD-2
@@ -51,20 +113,8 @@ Files: doc/sphinxext/*
Copyright: 2008, Stefan van der Walt <stefan@mentat.za.net>, Pauli
Virtanen <pav@iki.fi>
License: BSD-2
-Files: doc/sphinxext/compiler_unparse.py
- doc/sphinxext/comment_eater.py
- doc/sphinxext/traitsdoc.py
-Copyright: 2006, Enthought, Inc.
-License: BSD-3
-
-Files: doc/sphinxext/only_directives.py
- doc/sphinxext/plot_directive.py
-Copyright: 2002-2008, John D. Hunter
-License: matplotlib
-Origin: matplotlib
-
Files: debian/*
-Copyright: 2011-2013, Yaroslav Halchenko <debian@onerussian.com>
+Copyright: 2011-2018, Yaroslav Halchenko <debian@onerussian.com>
License: BSD-3
License: BSD-2
@@ -118,47 +168,6 @@ License: BSD-3
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License: matplotlib
- 1. This LICENSE AGREEMENT is between John D. Hunter (“JDH”), and the
- Individual or Organization (“Licensee”) accessing and otherwise using
- matplotlib software in source or binary form and its associated
- documentation.
- 2. Subject to the terms and conditions of this License Agreement, JDH
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use matplotlib
- 0.98.3 alone or in any derivative version, provided, however, that
- JDH’s License Agreement and JDH’s notice of copyright, i.e.,
- “Copyright (c) 2002-2008 John D. Hunter; All Rights Reserved” are
- retained in matplotlib 0.98.3 alone or in any derivative version
- prepared by Licensee.
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates matplotlib 0.98.3 or any part thereof, and wants to
- make the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to matplotlib 0.98.3.
- 4. JDH is making matplotlib 0.98.3 available to Licensee on an “AS
- IS” basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR
- FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB
- 0.98.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
- 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
- MATPLOTLIB 0.98.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL
- DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE
- USING MATPLOTLIB 0.98.3, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED
- OF THE POSSIBILITY THEREOF.
- 6. This License Agreement will automatically terminate upon a
- material breach of its terms and conditions.
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between JDH and
- Licensee. This License Agreement does not grant permission to use JDH
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- 8. By copying, installing or otherwise using matplotlib 0.98.3,
- Licensee agrees to be bound by the terms and conditions of this
- License Agreement.
-
License: Expat
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -195,3 +204,512 @@ License: Apache
.
On Debian systems full text of the license could be found in
/usr/share/common-licenses/Apache-2.0 .
+
+License: Python
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+ .
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF
hereby
+ grants Licensee a nonexclusive, royalty-free, world-wide license to
reproduce,
+ analyze, test, perform and/or display publicly, prepare derivative works,
+ distribute, and otherwise use Python alone or in any derivative version,
+ provided, however, that PSF's License Agreement and PSF's notice of
copyright,
+ i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
2009, 2010
+ Python Software Foundation; All Rights Reserved" are retained in
Python alone or
+ in any derivative version prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+
+License: public-domain
+ US federal government works
+
+License: CC-BY-SA-3.0
+ Creative Commons Attribution-ShareAlike 3.0 Unported
+ .
[license text - removed from this message for size]
diff --git a/debian/patches/918206.patch b/debian/patches/918206.patch
new file mode 100644
index 000000000..b4168bf49
--- /dev/null
+++ b/debian/patches/918206.patch
@@ -0,0 +1,38 @@
+Description: Fix np.array @ DataFrame matrix multiplication
+
+Using this and not upstream's __array_priority__ fix
+https://github.com/pandas-dev/pandas/commit/ad2a14f4bec8a004b2972c12f12ed3e4ce37ff52
+to allow np.array += DataFrame to remain in-place (same object ID /
+other views also affected) and an array (not a DataFrame).
+
+Author: jbrockmendel, Rebecca N. Palmer <rebecca_palmer@zoho.com>
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/918206 https://bugs.debian.org/923707
+Forwarded: not-needed
+
+--- a/pandas/core/generic.py
++++ b/pandas/core/generic.py
+@@ -1607,6 +1607,8 @@ class NDFrame(PandasObject, SelectionMixin):
+
+ def __array_wrap__(self, result, context=None):
+ d = self._construct_axes_dict(self._AXIS_ORDERS, copy=False)
++ if context is not None and context[0]==np.matmul and not
hasattr(context[1][0],'index'):
++ d.pop('index',None)
+ return self._constructor(result, **d).__finalize__(self)
+
+ # ideally we would define this to avoid the getattr checks, but
+--- a/pandas/tests/frame/test_analytics.py
++++ b/pandas/tests/frame/test_analytics.py
+@@ -2283,8 +2283,11 @@ class TestDataFrameAnalytics(TestData):
+
+ # np.array @ DataFrame
+ result = operator.matmul(a.values, b)
++ assert isinstance(result, DataFrame)
++ assert result.columns.equals(b.columns)
++ assert result.index.equals(pd.Index(range(3)))
+ expected = np.dot(a.values, b.values)
+- tm.assert_almost_equal(result, expected)
++ tm.assert_almost_equal(result.values, expected)
+
+ # nested list @ DataFrame (__rmatmul__)
+ result = operator.matmul(a.values.tolist(), b)
diff --git a/debian/patches/array_series_matmul.patch
b/debian/patches/array_series_matmul.patch
new file mode 100644
index 000000000..6fde8d986
--- /dev/null
+++ b/debian/patches/array_series_matmul.patch
@@ -0,0 +1,32 @@
+Description: Fix ordering of np.array @ Series
+
+Author: Ming Li
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/923708
+Forwarded: not-needed
+
+--- pandas-0.23.3+dfsg.orig/pandas/core/series.py
++++ pandas-0.23.3+dfsg/pandas/core/series.py
+@@ -2058,7 +2058,7 @@ class Series(base.IndexOpsMixin, generic
+
+ def __rmatmul__(self, other):
+ """ Matrix multiplication using binary `@` operator in
Python>=3.5 """
+- return self.dot(other)
++ return self.dot(np.transpose(other)).T
+
+ @Substitution(klass='Series')
+ @Appender(base._shared_docs['searchsorted'])
+--- pandas-0.23.3+dfsg.orig/pandas/tests/series/test_analytics.py
++++ pandas-0.23.3+dfsg/pandas/tests/series/test_analytics.py
+@@ -950,6 +950,11 @@ class TestSeriesAnalytics(TestData):
+ expected = np.dot(a.values, a.values)
+ assert_almost_equal(result, expected)
+
++ # np.array (matrix) @ Series (__rmatmul__)
++ result = operator.matmul(b.T.values, a)
++ expected = np.dot(b.T.values, a.values)
++ assert_almost_equal(result, expected)
++
+ # mixed dtype DataFrame @ Series
+ a['p'] = int(a.p)
+ result = operator.matmul(b.T, a)
diff --git a/debian/patches/deb_disable_googleanalytics
b/debian/patches/deb_disable_googleanalytics
index 0e68af0b6..58b22bebb 100644
--- a/debian/patches/deb_disable_googleanalytics
+++ b/debian/patches/deb_disable_googleanalytics
@@ -3,40 +3,6 @@ Author: Yaroslav Halchenko <debian@onerussian.com>
Last-Update: Mon, 23 Oct 2017 08:55:28 +0200
Description: Avoid privacy breach by Google Analytics
---- a/pandas/tests/io/data/macau.html
-+++ b/pandas/tests/io/data/macau.html
[section deleted as it applied to a file now removed for possible
copyright violation]
--- a/pandas/tests/io/data/spam.html
+++ b/pandas/tests/io/data/spam.html
@@ -27,45 +27,9 @@
diff --git a/debian/patches/series b/debian/patches/series
index 5ee25b8cc..e50e1bb9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,8 +20,11 @@ mark_tests_failing_on_386.patch
mathjax-path.patch
deb_ndsphinx_optional
deb_skip_difffailingtests
+918206.patch
# lintian: patch-file-present-but-not-mentioned-in-series
# Don't remove this comment, so that we can avoid a lintian warning.
# This patch is conditionally applied via d/rules.
# 0001-TST-pytest-deprecation-warnings-GH17197-17253-reversed.patch
+skip_tests_copyright.patch
+array_series_matmul.patch
diff --git a/debian/patches/skip_tests_copyright.patch
b/debian/patches/skip_tests_copyright.patch
new file mode 100644
index 000000000..208896813
--- /dev/null
+++ b/debian/patches/skip_tests_copyright.patch
@@ -0,0 +1,54 @@
+Description: Skip tests removed for copyright reasons
+
+and revert accidental change to _version.py
+
+Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+Forwarded: no
+
+--- a/pandas/_version.py
++++ b/pandas/_version.py
+@@ -20,8 +20,8 @@ def get_keywords():
+ # setup.py/versioneer.py will grep for the variable names, so they
must
+ # each be defined on a line of their own. _version.py will just call
+ # get_keywords().
++ git_refnames = "$Format:%d$"
++ git_full = "$Format:%H$"
+- git_refnames = " (tag: v0.23.3)"
+- git_full = "edb71fda022c6a155717e7a25679040ee0476639"
+ keywords = {"refnames": git_refnames, "full": git_full}
+ return keywords
+
+--- pandas-0.23.3+dfsg.orig/pandas/tests/io/test_html.py
++++ pandas-0.23.3+dfsg/pandas/tests/io/test_html.py
+@@ -365,6 +365,7 @@ class TestReadHtml(object):
+ assert sorted(zz) == sorted(['Repo', 'What'])
+
+ @pytest.mark.slow
++ @pytest.mark.skip(reason='test data removed for copyright reasons')
+ def test_thousands_macau_stats(self, datapath):
+ all_non_nan_table_index = -2
+ macau_data = datapath("io", "data", "macau.html")
+@@ -375,6 +376,7 @@ class TestReadHtml(object):
+ assert not any(s.isna().any() for _, s in df.iteritems())
+
+ @pytest.mark.slow
++ @pytest.mark.skip(reason='test data removed for copyright reasons')
+ def test_thousands_macau_index_col(self, datapath):
+ all_non_nan_table_index = -2
+ macau_data = datapath('io', 'data', 'macau.html')
+@@ -531,6 +533,7 @@ class TestReadHtml(object):
+ res2 = self.read_html(data2, header=0)
+ assert_framelist_equal(res1, res2)
+
++ @pytest.mark.skip(reason='test data removed for copyright reasons')
+ def test_nyse_wsj_commas_table(self, datapath):
+ data = datapath('io', 'data', 'nyse_wsj.html')
+ df = self.read_html(data, index_col=0, header=0,
+@@ -671,6 +674,7 @@ class TestReadHtml(object):
+ newdf = DataFrame({'datetime': raw_dates})
+ tm.assert_frame_equal(newdf, res[0])
+
++ @pytest.mark.skip(reason='test data removed for copyright reasons')
+ def test_computer_sales_page(self, datapath):
+ data = datapath('io', 'data', 'computer_sales_page.html')
+ with tm.assert_raises_regex(ParserError,
diff --git a/debian/rules b/debian/rules
index 720b21602..f777ddb96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ PYVER = $(shell pyversions -vd)
PY3VERS = $(shell py3versions -vr)
PY3VER = $(shell py3versions -vd)
-UVER := $(shell LC_ALL=C dpkg-parsechangelog | awk '/^Version:/{print
$$2;}' | sed -e 's,-[^-]*$$,,g')
+UVER := $(shell LC_ALL=C dpkg-parsechangelog | awk '/^Version:/{print
$$2;}' | sed -e 's,-[^-]*$$,,g' | sed -e 's,+dfsg,,g')
# Python doesn't use ~ for rc
UVER_PY := $(shell echo $(UVER) | sed -e 's,[~],,g')
UVER_PYSHORT := $(shell echo $(UVER_PY) | sed -e 's,+git.*,,g')
@@ -141,10 +141,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
ifneq (,$(findstring -a,$(DH_INTERNAL_OPTIONS)))
: # not building documentation in -a
else
- : # not building documentation ATM since requires ipython 0.11
- export PYTHONPATH=`/bin/ls -d
$$PWD/$(PACKAGE2_ROOT_DIR)/usr/lib/python$(PYVER)/*`; \
- export MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \
- cd doc; LC_ALL=C python make.py html
+ cd doc &&
PYTHONPATH=$(CURDIR)/$(PACKAGE3_ROOT_DIR)-lib/usr/lib/python3/dist-packages:$(CURDIR)/$(PACKAGE3_ROOT_DIR)/usr/lib/python3/dist-packages
MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build LC_ALL=C python3
make.py html
endif
endif
: # Use jquery from Debian package, so prune shipped one
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 000000000..9dfc4681f
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,12 @@
+Name: pandas
+Repository: https://github.com/pydata/pandas
+Documentation: https://pandas.pydata.org/pandas-docs/stable
+Bug-Database: https://github.com/pydata/pandas/issues
+Contact: https://pandas.pydata.org/community.html
+Reference:
+ Title: "pandas: a Foundational Python Library for Data Analysis and
Statistics"
+ Eprint:
https://www.scribd.com/doc/71048089/pandas-a-Foundational-Python-Library-for-Data-Analysis-and-Statistics
+ Author: McKinney, Wes
+ Booktitle: presented at PyHPC
+ Year: 2011
+Other-References: https://pandas.pydata.org/talks.html
Reply to: