From: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Date: Sat, 14 Sep 2019 15:37:43 +0000 (+0100)
Subject: skip_tests_copyright
X-Git-Tag: archive/raspbian/0.25.3+dfsg2-2+rpi1~1^2^2^2^2^2^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d6f2658514c2c7600e318ede4537476b459df2ed;p=pandas.git

skip_tests_copyright

and revert accidental change to _version.py

Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
Forwarded: no


Gbp-Pq: Name skip_tests_copyright.patch
---

diff --git a/pandas/_version.py b/pandas/_version.py
index 0679385d..f4c8938c 100644
--- 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 = " (tag: v0.23.3)"
-    git_full = "edb71fda022c6a155717e7a25679040ee0476639"
+    git_refnames = "$Format:%d$"
+    git_full = "$Format:%H$"
     keywords = {"refnames": git_refnames, "full": git_full}
     return keywords
 
diff --git a/pandas/tests/io/test_html.py b/pandas/tests/io/test_html.py
index 9c6a8de7..af2fcaf1 100644
--- a/pandas/tests/io/test_html.py
+++ b/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,