|
 |
54eaa03 |
From 62effe4db3d51c42531bf3f333bf82a3928358bf Mon Sep 17 00:00:00 2001
|
|
|
54eaa03 |
From: Tomas Orsava <torsava@redhat.com>
|
|
|
54eaa03 |
Date: Wed, 9 Aug 2017 14:46:01 +0200
|
|
|
54eaa03 |
Subject: [PATCH] Run test on a version specific pip
|
|
|
54eaa03 |
|
|
|
54eaa03 |
pip3 for Python 3, pip2 for Python 2, because the other might not be installed
|
|
|
54eaa03 |
---
|
|
|
54eaa03 |
setuptools/tests/test_develop.py | 2 +-
|
|
|
54eaa03 |
setuptools/tests/test_namespaces.py | 6 +++---
|
|
|
54eaa03 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
54eaa03 |
|
|
|
54eaa03 |
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
|
|
|
54eaa03 |
index ad7cfa0..c1b6e22 100644
|
|
|
54eaa03 |
--- a/setuptools/tests/test_develop.py
|
|
|
54eaa03 |
+++ b/setuptools/tests/test_develop.py
|
|
|
54eaa03 |
@@ -167,7 +167,7 @@ class TestNamespaces:
|
|
|
54eaa03 |
target = tmpdir / 'packages'
|
|
|
54eaa03 |
# use pip to install to the target directory
|
|
|
54eaa03 |
install_cmd = [
|
|
|
54eaa03 |
- 'pip',
|
|
|
54eaa03 |
+ 'pip%s' % sys.version_info.major,
|
|
|
54eaa03 |
'install',
|
|
|
54eaa03 |
str(pkg_A),
|
|
|
54eaa03 |
'-t', str(target),
|
|
|
54eaa03 |
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
|
|
|
54eaa03 |
index 721cad1..a71fd69 100644
|
|
|
54eaa03 |
--- a/setuptools/tests/test_namespaces.py
|
|
|
54eaa03 |
+++ b/setuptools/tests/test_namespaces.py
|
|
|
54eaa03 |
@@ -30,7 +30,7 @@ class TestNamespaces:
|
|
|
54eaa03 |
targets = site_packages, path_packages
|
|
|
54eaa03 |
# use pip to install to the target directory
|
|
|
54eaa03 |
install_cmd = [
|
|
|
54eaa03 |
- 'pip',
|
|
|
54eaa03 |
+ 'pip%s' % sys.version_info.major,
|
|
|
54eaa03 |
'install',
|
|
|
54eaa03 |
str(pkg_A),
|
|
|
54eaa03 |
'-t', str(site_packages),
|
|
|
54eaa03 |
@@ -38,7 +38,7 @@ class TestNamespaces:
|
|
|
54eaa03 |
subprocess.check_call(install_cmd)
|
|
|
54eaa03 |
namespaces.make_site_dir(site_packages)
|
|
|
54eaa03 |
install_cmd = [
|
|
|
54eaa03 |
- 'pip',
|
|
|
54eaa03 |
+ 'pip%s' % sys.version_info.major,
|
|
|
54eaa03 |
'install',
|
|
|
54eaa03 |
str(pkg_B),
|
|
|
54eaa03 |
'-t', str(path_packages),
|
|
|
54eaa03 |
@@ -88,7 +88,7 @@ class TestNamespaces:
|
|
|
54eaa03 |
target = tmpdir / 'packages'
|
|
|
54eaa03 |
# use pip to install to the target directory
|
|
|
54eaa03 |
install_cmd = [
|
|
|
54eaa03 |
- 'pip',
|
|
|
54eaa03 |
+ 'pip%s' % sys.version_info.major,
|
|
|
54eaa03 |
'install',
|
|
|
54eaa03 |
str(pkg_A),
|
|
|
54eaa03 |
'-t', str(target),
|
|
|
54eaa03 |
--
|
|
|
54eaa03 |
2.13.3
|
|
|
54eaa03 |
|