[med-svn] [Git][med-team/conda][master] Force python3 executable (default would otherwise be python)

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda


Commits:
01bfbb24 by Andreas Tille at 2019-03-13T08:17:40Z
Force python3 executable (default would otherwise be python)

- - - - -


3 changed files:

- + debian/patches/fix_python_executable.patch
- debian/patches/ignore_test_accessing_remote.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fix_python_executable.patch
=====================================
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 10 Mar 2019 09:33:50 +0100
+Description: Make sure we really seek for python3
+ Otherwise some tests are failing.
+
+--- a/conda/common/path.py
++++ b/conda/common/path.py
+@@ -155,9 +155,7 @@ def parse_entry_point_def(ep_definition)
+ def get_python_short_path(python_version=None):
+     if on_win:
+         return "python.exe"
+-    if python_version and '.' not in python_version:
+-        python_version = '.'.join(python_version)
+-    return join("bin", "python%s" % (python_version or ''))
++    return join("bin", "python3")
+ 
+ 
+ def get_python_site_packages_short_path(python_version):


=====================================
debian/patches/ignore_test_accessing_remote.patch
=====================================
@@ -46,3 +46,29 @@
  @pytest.mark.integration
  class TestConnectionWithShortTimeouts(TestCase):
  
+--- a/tests/core/test_index.py
++++ b/tests/core/test_index.py
+@@ -45,7 +45,7 @@ def test_check_whitelist():
+     check_whitelist(("conda-canary",))
+ 
+ 
+-
++ at pytest.mark.skipif(True, reason="Debian: access to network")
+ @pytest.mark.integration
+ class GetIndexIntegrationTests(TestCase):
+ 
+@@ -55,14 +55,12 @@ class GetIndexIntegrationTests(TestCase)
+         for dist, record in iteritems(index):
+             assert platform_in_record(linux64, record), (linux64, record.url)
+ 
+-    @pytest.mark.skipif(True, reason="Debian: not Linux")
+     def test_get_index_osx64_platform(self):
+         osx64 = 'osx-64'
+         index = get_index(platform=osx64)
+         for dist, record in iteritems(index):
+             assert platform_in_record(osx64, record), (osx64, record.url)
+ 
+-    @pytest.mark.skipif(True, reason="Debian: not Linux")
+     def test_get_index_win64_platform(self):
+         win64 = 'win-64'
+         index = get_index(platform=win64)


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,5 @@
 do_not_use_git_in_configure.patch
 skip_tests_needing_conda-build.patch
 ruamel_yaml_name.patch
+fix_python_executable.patch
 ignore_test_accessing_remote.patch



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda/commit/01bfbb2453c7f748d11c2f8a84ad931605badcf1
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/20190313/ffc18efa/attachment-0001.html>