diff -Nru pandas-1.1.5+dfsg/debian/changelog pandas-1.1.5+dfsg/debian/changelog --- pandas-1.1.5+dfsg/debian/changelog 2020-12-07 23:06:28.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/changelog 2021-01-12 21:06:04.000000000 +0000 @@ -1,3 +1,16 @@ +pandas (1.1.5+dfsg-2) unstable; urgency=medium + + * Remove dead URL from tests/examples. (Closes: #979621) + * Mark autopkgtest needs-internet. + * Revert "Print uname etc during build". + * Mark matplotlib nocheck/nodoc and allow building on ports without + matplotlib or numexpr. (Closes: #977470) + * Add python3-tabulate build/test-depends. + * Add bottleneck and numexpr test-depends. + * Tests: don't require warnings that jedi no longer produces. + + -- Rebecca N. Palmer Tue, 12 Jan 2021 21:06:04 +0000 + pandas (1.1.5+dfsg-1) unstable; urgency=medium * Upstream bugfix release. Refresh patches, contributors_list. diff -Nru pandas-1.1.5+dfsg/debian/control pandas-1.1.5+dfsg/debian/control --- pandas-1.1.5+dfsg/debian/control 2020-12-07 08:13:31.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/control 2021-01-11 08:27:35.000000000 +0000 @@ -18,14 +18,14 @@ python3-hypothesis , python3-jinja2 , python3-lxml , - python3-matplotlib [!hurd-i386], + python3-matplotlib [!ia64 !sh4 !x32] , # armel, s390x numba crash, mipsel gives wrong answer, most ports don't have numba # re-add when #972246 is fixed python3-numba (>= 0.46.0~) [amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x] , - python3-numexpr (>= 2.6.2~) , + python3-numexpr (>= 2.6.2~) [!kfreebsd-any !sparc64] , python3-numpy, python3-odf , python3-openpyxl , -# upstream actually want pytest >= 5.0.1 but we don't have that +# upstream actually want pytest >= 5.0.1 but we don't have that in testing python3-pytest (>= 4.0.2~) , python3-pytest-asyncio , python3-pytest-forked , @@ -34,7 +34,7 @@ python3-setuptools, python3-six, python3-tables (>= 3.4.3~) , -# too old in Debian python3-tabulate (>= 0.8.3~) , + python3-tabulate (>= 0.8.3~) , python3-tk , python3-tz , # broken - #976620 python3-xlrd , diff -Nru pandas-1.1.5+dfsg/debian/patches/979621_dead_url.patch pandas-1.1.5+dfsg/debian/patches/979621_dead_url.patch --- pandas-1.1.5+dfsg/debian/patches/979621_dead_url.patch 1970-01-01 00:00:00.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/patches/979621_dead_url.patch 2021-01-10 20:14:52.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Stop using now-dead URL in tests/examples + +Origin: loosely based on upstream commit 68db2d26ddb5f95de4254d61b850d3dcaf6ce717 +Author: patrick "phofl", Rebecca N. Palmer +Bug: https://github.com/pandas-dev/pandas/issues/38988 +Bug-Debian: https://bugs.debian.org/979621 +Forwarded: no + +--- a/doc/source/user_guide/io.rst ++++ b/doc/source/user_guide/io.rst +@@ -2377,14 +2377,10 @@ Read a URL with no options: + + .. ipython:: python + +- url = 'https://www.fdic.gov/bank/individual/failed/banklist.html' ++ url = 'https://raw.githubusercontent.com/pandas-dev/pandas/master/pandas/tests/io/data/html/banklist.html' + dfs = pd.read_html(url) + dfs + +-.. note:: +- +- The data from the above URL changes every Monday so the resulting data above +- and the data below may be slightly different. + + Read in the content of the file from the above URL and pass it to ``read_html`` + as a string: +--- a/pandas/tests/io/test_html.py ++++ b/pandas/tests/io/test_html.py +@@ -123,7 +123,7 @@ class TestReadHtml: + + @tm.network + def test_banklist_url_positional_match(self): +- url = "http://www.fdic.gov/bank/individual/failed/banklist.html" ++ url = "https://raw.githubusercontent.com/pandas-dev/pandas/master/pandas/tests/io/data/html/banklist.html" + # Passing match argument as positional should cause a FutureWarning. + with tm.assert_produces_warning(FutureWarning): + df1 = self.read_html( +@@ -136,7 +136,7 @@ class TestReadHtml: + + @tm.network + def test_banklist_url(self): +- url = "http://www.fdic.gov/bank/individual/failed/banklist.html" ++ url = "https://raw.githubusercontent.com/pandas-dev/pandas/master/pandas/tests/io/data/html/banklist.html" + df1 = self.read_html( + url, match="First Federal Bank of Florida", attrs={"id": "table"} + ) diff -Nru pandas-1.1.5+dfsg/debian/patches/jedi018_compat.patch pandas-1.1.5+dfsg/debian/patches/jedi018_compat.patch --- pandas-1.1.5+dfsg/debian/patches/jedi018_compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/patches/jedi018_compat.patch 2021-01-12 08:43:56.000000000 +0000 @@ -0,0 +1,63 @@ +Description: Don't require external warnings that no longer exist + +(The cause is not actually known to be jedi 0.18, but it moved to a +new upstream version since the last pandas and ipython didn't.) + +Author: Rebecca N. Palmer +Forwarded: no + +--- pandas-1.1.5+dfsg.orig/pandas/tests/arrays/categorical/test_warnings.py ++++ pandas-1.1.5+dfsg/pandas/tests/arrays/categorical/test_warnings.py +@@ -18,7 +18,7 @@ class TestCategoricalWarnings: + # GH 31324 newer jedi version raises Deprecation warning + import jedi + +- if jedi.__version__ < "0.16.0": ++ if jedi.__version__ < "0.16.0" or jedi.__version__ >= "0.18.0": + warning = tm.assert_produces_warning(None) + else: + warning = tm.assert_produces_warning( +--- pandas-1.1.5+dfsg.orig/pandas/tests/frame/test_api.py ++++ pandas-1.1.5+dfsg/pandas/tests/frame/test_api.py +@@ -542,7 +542,7 @@ class TestDataFrameMisc: + # GH 33567, jedi version raises Deprecation warning in Ipython + import jedi + +- if jedi.__version__ < "0.17.0": ++ if jedi.__version__ < "0.17.0" or jedi.__version__ >= "0.18.0": + warning = tm.assert_produces_warning(None) + else: + warning = tm.assert_produces_warning( +--- pandas-1.1.5+dfsg.orig/pandas/tests/indexes/test_base.py ++++ pandas-1.1.5+dfsg/pandas/tests/indexes/test_base.py +@@ -2206,7 +2206,7 @@ Index(['a', 'bb', 'ccc', 'a', 'bb', 'ccc + # GH 31324 newer jedi version raises Deprecation warning + import jedi + +- if jedi.__version__ < "0.16.0": ++ if jedi.__version__ < "0.16.0" or jedi.__version__ >= "0.18.0": + warning = tm.assert_produces_warning(None) + else: + warning = tm.assert_produces_warning( +--- pandas-1.1.5+dfsg.orig/pandas/tests/resample/test_resampler_grouper.py ++++ pandas-1.1.5+dfsg/pandas/tests/resample/test_resampler_grouper.py +@@ -33,7 +33,7 @@ async def test_tab_complete_ipython6_war + # GH 33567, jedi version raises Deprecation warning in Ipython + import jedi + +- if jedi.__version__ < "0.17.0": ++ if jedi.__version__ < "0.17.0" or jedi.__version__ >= "0.18.0": + warning = tm.assert_produces_warning(None) + else: + warning = tm.assert_produces_warning(DeprecationWarning, check_stacklevel=False) +--- pandas-1.1.5+dfsg.orig/pandas/tests/series/test_api.py ++++ pandas-1.1.5+dfsg/pandas/tests/series/test_api.py +@@ -498,7 +498,7 @@ class TestSeriesMisc: + # GH 33567, jedi version raises Deprecation warning in Ipython + import jedi + +- if jedi.__version__ < "0.17.0": ++ if jedi.__version__ < "0.17.0" or jedi.__version__ >= "0.18.0": + warning = tm.assert_produces_warning(None) + else: + warning = tm.assert_produces_warning( diff -Nru pandas-1.1.5+dfsg/debian/patches/series pandas-1.1.5+dfsg/debian/patches/series --- pandas-1.1.5+dfsg/debian/patches/series 2020-12-07 07:27:34.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/patches/series 2021-01-12 08:39:09.000000000 +0000 @@ -26,3 +26,5 @@ python39_compat.patch xlrd_976620.patch i386_time_overflow.patch +979621_dead_url.patch +jedi018_compat.patch diff -Nru pandas-1.1.5+dfsg/debian/rules pandas-1.1.5+dfsg/debian/rules --- pandas-1.1.5+dfsg/debian/rules 2020-12-07 08:10:11.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/rules 2021-01-10 21:56:24.000000000 +0000 @@ -77,7 +77,6 @@ dh_clean override_dh_auto_build-arch: # ${PY3VERS:%=_uncythonize%} - python3 $(CURDIR)/debian/uname_test.py || true mkdir -p buildtmp [ -e pandas/__version.py ] || \ echo -e "version = '$(UVER_PY)'\nshort_version = '$(UVER_PYSHORT)'" > pandas/__version.py diff -Nru pandas-1.1.5+dfsg/debian/tests/control pandas-1.1.5+dfsg/debian/tests/control --- pandas-1.1.5+dfsg/debian/tests/control 2020-12-06 21:54:11.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/tests/control 2021-01-11 08:27:44.000000000 +0000 @@ -12,6 +12,7 @@ Tests: unittests3 Depends: locales-all, python3-all, + python3-bottleneck (>= 1.2.1~), python3-bs4, python3-dask (>= 2.10.1~), python3-dateutil (>= 2.7.3~), @@ -22,11 +23,12 @@ python3-matplotlib [!hurd-i386], # armel, s390x numba crash, mipsel gives wrong answer, most ports don't have numba # re-add when #972246 is fixed python3-numba (>= 0.46.0~) [amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x], + python3-numexpr (>= 2.6.2~), python3-numpy (>= 1:1.15~), python3-odf, python3-openpyxl, python3-pandas, -# upstream actually want pytest >= 5.0.1 but we don't have that +# upstream actually want pytest >= 5.0.1 but we don't have that in testing python3-pytest (>= 4.0.2~), python3-pytest-asyncio, python3-pytest-forked, @@ -35,7 +37,7 @@ python3-six, python3-statsmodels, python3-tables (>= 3.4.3~), -# too old in Debian python3-tabulate (>= 0.8.3~), + python3-tabulate (>= 0.8.3~), python3-tk, python3-tz, python3-xarray, @@ -45,4 +47,4 @@ xauth, xvfb, xclip, -Restrictions: allow-stderr +Restrictions: allow-stderr, needs-internet diff -Nru pandas-1.1.5+dfsg/debian/uname_test.py pandas-1.1.5+dfsg/debian/uname_test.py --- pandas-1.1.5+dfsg/debian/uname_test.py 2020-12-07 08:09:12.000000000 +0000 +++ pandas-1.1.5+dfsg/debian/uname_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/usr/bin/python3 - -# testing methods of finding the architecture, for e.g. #973584 - -import sys -import sysconfig -import platform -import struct - -print("973584 test - uname:",platform.uname(),"sysp:",sys.platform,"getplatform:",sysconfig.get_platform(),"pp:",platform.platform(),"parch:",platform.architecture(),"byteorder:",sys.byteorder,"maxsize:",sys.maxsize,"psize",struct.calcsize("P"))