Merge branch 'explicit-cb' of https://github.com/cpcloud/pandas into cpcloud-explicit-cb

Conflicts:
	doc/source/release.rst

Author: jreback

.travis.yml

@@ -14,33 +14,33 @@ matrix:
     include:
     - python: 2.6
       env:
-      - NOSE_ARGS="not slow and not network"
+      - NOSE_ARGS="not slow and not network and not disabled"
       - CLIPBOARD=xclip
       - LOCALE_OVERRIDE="it_IT.UTF-8"
       - JOB_NAME: "26_nslow_nnet" # ScatterCI Build name, 20 chars max
     - python: 2.7
       env:
-      - NOSE_ARGS="slow and not network"
+      - NOSE_ARGS="slow and not network and not disabled"
       - LOCALE_OVERRIDE="zh_CN.GB18030"
       - FULL_DEPS=true
       - JOB_TAG=_LOCALE
       - JOB_NAME: "27_slow_nnet_LOCALE" # ScatterCI Build name, 20 chars max
     - python: 2.7
       env:
-      - NOSE_ARGS="not slow"
+      - NOSE_ARGS="not slow and not disabled"
       - FULL_DEPS=true
       - CLIPBOARD_GUI=gtk2
       - JOB_NAME: "27_nslow" # ScatterCI Build name, 20 chars max
       - DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
     - python: 3.2
       env:
-      - NOSE_ARGS="not slow"
+      - NOSE_ARGS="not slow and not disabled"
       - FULL_DEPS=true
       - CLIPBOARD_GUI=qt4
       - JOB_NAME: "32_nslow"  # ScatterCI Build name, 20 chars max
     - python: 3.3
       env:
-      - NOSE_ARGS="not slow"
+      - NOSE_ARGS="not slow and not disabled"
       - FULL_DEPS=true
       - CLIPBOARD=xsel
       - JOB_NAME: "33_nslow"  # ScatterCI Build name, 20 chars max

doc/source/release.rst

@@ -112,6 +112,7 @@ Bug Fixes
   (:issue:`6351`)
 - Bug correctly handle placements of ``-inf`` in Panels when dividing by integer 0 (:issue:`6178`)
 - ``DataFrame.shift`` with ``axis=1`` was raising (:issue:`6371`)
+- Disabled clipboard tests until release time (run locally with ``nosetests -A disabled`` (:issue:`6048`).
 
 pandas 0.13.1
 -------------

pandas/io/tests/test_clipboard.py

@@ -8,7 +8,7 @@
 from pandas import read_clipboard
 from pandas import get_option
 from pandas.util import testing as tm
-from pandas.util.testing import makeCustomDataframe as mkdf
+from pandas.util.testing import makeCustomDataframe as mkdf, disabled
 
 
 try:
@@ -17,6 +17,7 @@
     raise nose.SkipTest("no clipboard found")
 
 
+@disabled
 class TestClipboard(tm.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -38,7 +39,7 @@ def setUpClass(cls):
         max_rows = get_option('display.max_rows')
         cls.data['longdf'] = mkdf(max_rows+1, 3, data_gen_f=lambda *args: randint(2),
                                   c_idx_type='s', r_idx_type='i',
-                                  c_idx_names=[None], r_idx_names=[None])  
+                                  c_idx_names=[None], r_idx_names=[None])
         cls.data_types = list(cls.data.keys())
 
     @classmethod

pandas/util/testing.py

@@ -1002,7 +1002,7 @@ def dec(f):
     60,  # urllib.error.URLError: [Errno 60] Connection timed out
     )
 
-# Both of the above shouldn't mask reasl issues such as 404's
+# Both of the above shouldn't mask real issues such as 404's
 # or refused connections (changed DNS).
 # But some tests (test_data yahoo) contact incredibly flakey
 # servers.
@@ -1402,3 +1402,8 @@ def skip_if_no_ne(engine='numexpr'):
         if ne.__version__ < LooseVersion('2.0'):
             raise nose.SkipTest("numexpr version too low: "
                                 "%s" % ne.__version__)
+
+
+def disabled(t):
+    t.disabled = True
+    return t