intermediate changes

ref:cde9a383711a11544ce7e107a78147fb96cc4029

1 files changed, 92 insertions, 0 deletions

diff --git a/contrib/python/traitlets/py3/patches/01-fix-tests.patch b/contrib/python/traitlets/py3/patches/01-fix-tests.patch
new file mode 100644
index 00000000000..a4b6de274d4
--- /dev/null
+++ b/contrib/python/traitlets/py3/patches/01-fix-tests.patch
@@ -0,0 +1,92 @@
+--- contrib/python/traitlets/py3/traitlets/config/tests/test_configurable.py	(index)
++++ contrib/python/traitlets/py3/traitlets/config/tests/test_configurable.py	(working tree)
+@@ -22,7 +22,7 @@ from traitlets.traitlets import (
+ 
+ from traitlets.config.loader import Config
+ 
+-from ...tests._warnings import expected_warnings
++from traitlets.tests._warnings import expected_warnings
+ 
+ class MyConfigurable(Configurable):
+     a = Integer(1, help="The integer a.").tag(config=True)
+--- contrib/python/traitlets/py3/traitlets/config/tests/test_application.py	(index)
++++ contrib/python/traitlets/py3/traitlets/config/tests/test_application.py	(working tree)
+@@ -629,6 +629,8 @@ class TestApplication(TestCase):
+             self.assertEqual(app.running, False)
+ 
+ 
++
++@mark.skip
+ def test_cli_multi_scalar(caplog):
+     class App(Application):
+         aliases = {"opt": "App.opt"}
+@@ -648,7 +650,7 @@ def test_cli_multi_scalar(caplog):
+ 
+ class Root(Application):
+     subcommands = {
+-        'sub1': ('traitlets.config.tests.test_application.Sub1', 'import string'),
++        'sub1': ('__tests__.config.tests.test_application.Sub1', 'import string'),
+     }
+ 
+ 
+--- contrib/python/traitlets/py3/traitlets/tests/test_traitlets.py	(index)
++++ contrib/python/traitlets/py3/traitlets/tests/test_traitlets.py	(working tree)
+@@ -13,7 +13,7 @@ from unittest import TestCase
+ 
+ import pytest
+ 
+-from ._warnings import expected_warnings
++from traitlets.tests._warnings import expected_warnings
+ from traitlets import (
+     HasTraits,
+     MetaHasTraits,
+--- contrib/python/traitlets/py3/traitlets/utils/tests/test_bunch.py	(index)
++++ contrib/python/traitlets/py3/traitlets/utils/tests/test_bunch.py	(working tree)
+@@ -1,4 +1,4 @@
+-from ..bunch import Bunch
++from traitlets.utils.bunch import Bunch
+ 
+ def test_bunch():
+     b = Bunch(x=5, y=10)
+--- contrib/python/traitlets/py3/traitlets/utils/tests/test_decorators.py	(index)
++++ contrib/python/traitlets/py3/traitlets/utils/tests/test_decorators.py	(working tree)
+@@ -2,9 +2,9 @@ from unittest import TestCase
+ 
+ from inspect import Signature, Parameter, signature
+ 
+-from ...traitlets import HasTraits, Int, Unicode
++from traitlets.traitlets import HasTraits, Int, Unicode
+ 
+-from ..decorators import signature_has_traits
++from traitlets.utils.decorators import signature_has_traits
+ 
+ 
+ class TestExpandSignature(TestCase):
+--- contrib/python/traitlets/py3/traitlets/utils/tests/test_importstring.py	(index)
++++ contrib/python/traitlets/py3/traitlets/utils/tests/test_importstring.py	(working tree)
+@@ -8,7 +8,7 @@
+ import os
+ from unittest import TestCase
+ 
+-from ..importstring import import_item
++from traitlets.utils.importstring import import_item
+ 
+ 
+ class TestImportItem(TestCase):
+--- contrib/python/traitlets/py3/traitlets/tests/utils.py	(index)
++++ contrib/python/traitlets/py3/traitlets/tests/utils.py	(working tree)
+@@ -1,10 +1,13 @@
+ from subprocess import Popen, PIPE
+ import sys
++import os
+ 
+ 
+ def get_output_error_code(cmd):
+     """Get stdout, stderr, and exit code from running a command"""
+-    p = Popen(cmd, stdout=PIPE, stderr=PIPE)
++    env = os.environ.copy()
++    env['Y_PYTHON_ENTRY_POINT'] = ':main'
++    p = Popen(cmd, stdout=PIPE, stderr=PIPE, env=env)
+     out, err = p.communicate()
+     out = out.decode('utf8', 'replace')
+     err = err.decode('utf8', 'replace')