Updating liguros repo

2 files changed, 55 insertions, 0 deletions

diff --git a/dev-python/sh/files/sh-1.12.14-skip-unreliable-test.patch b/dev-python/sh/files/sh-1.12.14-skip-unreliable-test.patch
new file mode 100644
index 000000000000..aa4f75727a17
--- /dev/null
+++ b/dev-python/sh/files/sh-1.12.14-skip-unreliable-test.patch
@@ -0,0 +1,12 @@
+diff --git a/test.py b/test.py
+index 68ef40c..e5d48da 100644
+--- a/test.py
++++ b/test.py
+@@ -500,2 +500,3 @@ while True:
+ 
++    @unittest.skip("Test is unreliable")
+     def test_environment(self):
+@@ -587,2 +588,3 @@ exit(2)
+ 
++    @unittest.skip("Test seems to be unreliable")
+     def test_piped_exception1(self):
diff --git a/dev-python/sh/files/sh-1.12.14-tests.patch b/dev-python/sh/files/sh-1.12.14-tests.patch
new file mode 100644
index 000000000000..bc3d1b59fef6
--- /dev/null
+++ b/dev-python/sh/files/sh-1.12.14-tests.patch
@@ -0,0 +1,43 @@
+diff --git a/test.py b/test.py
+index 68ef40c..640e5b5 100644
+--- a/test.py
++++ b/test.py
+@@ -515,6 +515,13 @@ def test_environment(self):
+             "VERSIONER_PYTHON_VERSION",
+         ]
+
++        # On python-3.7+, the changes for no encoding inject LC_CTYPE into subprocesses
++        py37_extra_envvars = [
++            "LC_CTYPE",
++        ]
++
++        prune_envvars = osx_cruft + py37_extra_envvars
++
+         # first we test that the environment exists in our child process as
+         # we've set it
+         py = create_tmp_test("""
+@@ -525,7 +532,7 @@ def test_environment(self):
+     try: del os.environ[key]
+     except: pass
+ print(os.environ["HERP"] + " " + str(len(os.environ)))
+-""" % osx_cruft)
++""" % prune_envvars)
+         out = python(py.name, _env=env).strip()
+         self.assertEqual(out, "DERP 1")
+
+@@ -533,12 +540,12 @@ def test_environment(self):
+ import os, sys
+ sys.path.insert(0, os.getcwd())
+ import sh
+-osx_cruft = %s
+-for key in osx_cruft:
++prune_envvars = %s
++for key in prune_envvars:
+     try: del os.environ[key]
+     except: pass
+ print(sh.HERP + " " + str(len(os.environ)))
+-""" % osx_cruft)
++""" % prune_envvars)
+         out = python(py.name, _env=env, _cwd=THIS_DIR).strip()
+         self.assertEqual(out, "DERP 1")
+