[med-svn] [Git][med-team/conda][master] Adapting patches to new upstream version

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda


Commits:
f166c4d6 by Andreas Tille at 2019-04-04T17:24:22Z
Adapting patches to new upstream version

- - - - -


3 changed files:

- debian/patches/ignore_tests_using_charizard.patch
- debian/patches/ruamel_yaml_name.patch
- debian/patches/skip_tests_needing_conda-build.patch


Changes:

=====================================
debian/patches/ignore_tests_using_charizard.patch
=====================================
@@ -5,7 +5,7 @@ Description: Somehow these dirs charizard and venusaur are not added to PATH in
 
 --- a/tests/test_activate.py
 +++ b/tests/test_activate.py
-@@ -1516,7 +1516,7 @@ class ShellWrapperIntegrationTests(TestC
+@@ -1517,7 +1517,7 @@ class ShellWrapperIntegrationTests(TestC
  
          shell.assert_env_var('CONDA_SHLVL', '0')
          PATH0 = shell.get_env_var('PATH', '').strip(':')
@@ -14,7 +14,7 @@ Description: Somehow these dirs charizard and venusaur are not added to PATH in
          shell.sendline("type conda")
          shell.expect(conda_is_a_function)
  
-@@ -1655,22 +1655,22 @@ class ShellWrapperIntegrationTests(TestC
+@@ -1656,22 +1656,22 @@ class ShellWrapperIntegrationTests(TestC
          shell.sendline('conda' + activate + '"%s" --stack' % self.prefix3)
          shell.assert_env_var('CONDA_SHLVL', '2')
          PATH2 = shell.get_env_var('PATH').strip(':')


=====================================
debian/patches/ruamel_yaml_name.patch
=====================================
@@ -42,28 +42,20 @@ Description: For some strange reason ruamel.yaml is named ruamel_yaml
                            (MatchSpec('flask'), ))
 --- a/tests/test_history.py
 +++ b/tests/test_history.py
-@@ -9,7 +9,7 @@ from conda.exceptions import CondaUpgrad
- from conda.gateways.disk import mkdir_p
- from .decorators import skip_if_no_mock
- from .helpers import mock, tempdir
--from .test_create import make_temp_prefix
-+#from .test_create import make_temp_prefix
+@@ -35,6 +35,7 @@ class HistoryTestCase(unittest.TestCase)
+                     pass
+             self.assertEqual(1, update.call_count)
  
- from conda.history import History
- from conda.resolve import MatchSpec
-@@ -44,6 +44,7 @@ class HistoryTestCase(unittest.TestCase)
++    @pytest.mark.skipif(True, reason="Debian: access to network")
+     @skip_if_no_mock
+     def test_returns_history_object_as_context_object(self):
+         h = History("/path/to/prefix")
+@@ -44,7 +45,7 @@ class HistoryTestCase(unittest.TestCase)
                  with h as h2:
                      self.assertEqual(h, h2)
  
+-    @pytest.mark.skipif(True, reason="Debian: needs definition from test_create.py which is excluded from Debian tests")
 +    @pytest.mark.skipif(True, reason="Debian: access to network")
      @skip_if_no_mock
      def test_empty_history_check_on_empty_env(self):
          with mock.patch.object(History, 'file_is_empty') as mock_file_is_empty:
-@@ -54,6 +55,7 @@ class HistoryTestCase(unittest.TestCase)
-         self.assertEqual(mock_file_is_empty.call_count, 1)
-         assert not h.file_is_empty()
- 
-+    @pytest.mark.skipif(True, reason="Debian: access to network")
-     @skip_if_no_mock
-     @auto_inject_fixtures('tmpdir')
-     def test_parse_on_empty_env(self):


=====================================
debian/patches/skip_tests_needing_conda-build.patch
=====================================
@@ -6,6 +6,15 @@ Description: There is a circular dependency in the test suite between
 
 --- a/tests/test_link_order.py
 +++ b/tests/test_link_order.py
+@@ -10,7 +10,7 @@ import tempfile
+ 
+ from .test_create import run_command, Commands
+ 
+-from conda_build import api
++# from conda_build import api
+ 
+ try:
+     from unittest.mock import patch
 @@ -19,6 +19,8 @@ except ImportError:
  
  log = getLogger(__name__)
@@ -15,3 +24,55 @@ Description: There is a circular dependency in the test suite between
  class TestLinkOrder(unittest.TestCase):
      def setUp(self):
          self.prefix = tempfile.mkdtemp()
+--- a/tests/test_history.py
++++ b/tests/test_history.py
+@@ -9,7 +9,7 @@ from conda.exceptions import CondaUpgrad
+ from conda.gateways.disk import mkdir_p
+ from .decorators import skip_if_no_mock
+ from .helpers import mock, tempdir
+-from .test_create import make_temp_prefix
++#from .test_create import make_temp_prefix
+ 
+ from conda.history import History
+ from conda.resolve import MatchSpec
+@@ -44,6 +44,7 @@ class HistoryTestCase(unittest.TestCase)
+                 with h as h2:
+                     self.assertEqual(h, h2)
+ 
++    @pytest.mark.skipif(True, reason="Debian: needs definition from test_create.py which is excluded from Debian tests")
+     @skip_if_no_mock
+     def test_empty_history_check_on_empty_env(self):
+         with mock.patch.object(History, 'file_is_empty') as mock_file_is_empty:
+@@ -54,6 +55,7 @@ class HistoryTestCase(unittest.TestCase)
+         self.assertEqual(mock_file_is_empty.call_count, 1)
+         assert not h.file_is_empty()
+ 
++    @pytest.mark.skipif(True, reason="Debian: needs definition from test_create.py which is excluded from Debian tests")
+     @skip_if_no_mock
+     @auto_inject_fixtures('tmpdir')
+     def test_parse_on_empty_env(self):
+--- a/tests/test_activate.py
++++ b/tests/test_activate.py
+@@ -29,10 +29,11 @@ from conda.gateways.disk.delete import r
+ from conda.gateways.disk.update import touch
+ import pytest
+ from tests.helpers import tempdir
+-from tests.test_create import Commands, run_command
++#from tests.test_create import Commands, run_command
+ from conda._vendor.auxlib.decorators import memoize
+ from re import escape
+-from .test_create import SPACER_CHARACTER
++#from .test_create import SPACER_CHARACTER
++SPACER_CHARACTER = ' '
+ 
+ try:
+     from unittest.mock import patch
+@@ -1485,7 +1486,7 @@ class ShellWrapperIntegrationTests(TestC
+                          "a conda env. They stack envs which means that the"
+                          "the original sys.prefix conda env falls off of it."
+                         .format(sys.prefix))
+-            run_command(Commands.INSTALL, self.prefix3, "git")
++#            run_command(Commands.INSTALL, self.prefix3, "git")
+ 
+     def tearDown(self):
+         rm_rf(self.prefix)



View it on GitLab: https://salsa.debian.org/med-team/conda/commit/f166c4d6cf42bc059ef8e0d3aeabc335d3e6fab5

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda/commit/f166c4d6cf42bc059ef8e0d3aeabc335d3e6fab5
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190404/d03e885a/attachment-0001.html>