Loading debian/control +1 −0 Original line number Diff line number Diff line Loading @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 12~), python3-pycosat, python3-requests, python3-ruamel.yaml, python3-responses, python3-pytest Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/med-team/conda Loading debian/patches/do_not_use_git_in_configure.patch +4 −0 Original line number Diff line number Diff line Author: Andreas Tille <tille@debian.org> Last-Update: Sun, 10 Mar 2019 09:33:50 +0100 Description: We can not clone anything in a chroot so do not rely on Git --- a/conda/_vendor/auxlib/packaging.py +++ b/conda/_vendor/auxlib/packaging.py @@ -157,7 +157,7 @@ def get_version(dunder_file): Loading debian/patches/series +1 −0 Original line number Diff line number Diff line do_not_use_git_in_configure.patch skip_tests_needing_conda-build.patch debian/patches/skip_tests_needing_conda-build.patch 0 → 100644 +46 −0 Original line number Diff line number Diff line Author: Andreas Tille <tille@debian.org> Last-Update: Sun, 10 Mar 2019 09:33:50 +0100 Description: There is a circular dependency in the test suite between conda and conda-build. Skip the tests needing conda-build here to break this circle. --- a/tests/test_link_order.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function, unicode_literals - -from logging import getLogger -import unittest -import pytest -import os -import shutil -import tempfile - -from .test_create import run_command, Commands - -from conda_build import api - -try: - from unittest.mock import patch -except ImportError: - from mock import patch - -log = getLogger(__name__) - -class TestLinkOrder(unittest.TestCase): - def setUp(self): - self.prefix = tempfile.mkdtemp() - - def tearDown(self): - shutil.rmtree(self.prefix) - - @pytest.mark.integration - def test_link_order_post_link_actions(self): - stdout, stderr = run_command(Commands.CREATE, self.prefix, "c_post_link_package -c conda-test") - assert(stderr == '') - - @pytest.mark.integration - def test_link_order_post_link_depend(self): - stdout, stderr = run_command(Commands.CREATE, self.prefix, "e_post_link_package -c conda-test") - assert(stderr == '') Loading
debian/control +1 −0 Original line number Diff line number Diff line Loading @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 12~), python3-pycosat, python3-requests, python3-ruamel.yaml, python3-responses, python3-pytest Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/med-team/conda Loading
debian/patches/do_not_use_git_in_configure.patch +4 −0 Original line number Diff line number Diff line Author: Andreas Tille <tille@debian.org> Last-Update: Sun, 10 Mar 2019 09:33:50 +0100 Description: We can not clone anything in a chroot so do not rely on Git --- a/conda/_vendor/auxlib/packaging.py +++ b/conda/_vendor/auxlib/packaging.py @@ -157,7 +157,7 @@ def get_version(dunder_file): Loading
debian/patches/series +1 −0 Original line number Diff line number Diff line do_not_use_git_in_configure.patch skip_tests_needing_conda-build.patch
debian/patches/skip_tests_needing_conda-build.patch 0 → 100644 +46 −0 Original line number Diff line number Diff line Author: Andreas Tille <tille@debian.org> Last-Update: Sun, 10 Mar 2019 09:33:50 +0100 Description: There is a circular dependency in the test suite between conda and conda-build. Skip the tests needing conda-build here to break this circle. --- a/tests/test_link_order.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function, unicode_literals - -from logging import getLogger -import unittest -import pytest -import os -import shutil -import tempfile - -from .test_create import run_command, Commands - -from conda_build import api - -try: - from unittest.mock import patch -except ImportError: - from mock import patch - -log = getLogger(__name__) - -class TestLinkOrder(unittest.TestCase): - def setUp(self): - self.prefix = tempfile.mkdtemp() - - def tearDown(self): - shutil.rmtree(self.prefix) - - @pytest.mark.integration - def test_link_order_post_link_actions(self): - stdout, stderr = run_command(Commands.CREATE, self.prefix, "c_post_link_package -c conda-test") - assert(stderr == '') - - @pytest.mark.integration - def test_link_order_post_link_depend(self): - stdout, stderr = run_command(Commands.CREATE, self.prefix, "e_post_link_package -c conda-test") - assert(stderr == '')