File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -59,11 +59,11 @@ install:
59
59
# parent CMD process).
60
60
- " SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\ Scripts;%PATH%"
61
61
# Check that we have the expected version and architecture for Python
62
- - " %TOXPYTHON --version"
63
- - " %TOXPYTHON% -c \" import struct; print(struct.calcsize('P') * 8)\" "
62
+ - " python --version"
63
+ - " python -c \" import struct; print(struct.calcsize('P') * 8)\" "
64
64
# Upgrade to the latest version of pip to avoid it displaying warnings
65
65
# about it being out of date.
66
- - ' pip install --disable-pip-version-check --user --upgrade pip'
66
+ - ' python -m pip install --disable-pip-version-check --user --upgrade pip'
67
67
# install tox
68
68
- pip install tox
69
69
# install of the actual project is handled by tox in tests
Original file line number Diff line number Diff line change 12
12
13
13
import nose .tools as nt
14
14
import pip
15
+ from pip import __main__
15
16
from jupyter_contrib_core .testing_utils import (
16
17
get_logger , patch_traitlets_app_logs ,
17
18
)
@@ -65,7 +66,7 @@ def setUp(self):
65
66
def install_old_pkg (self ):
66
67
old_pkg_project_name = self .old_pkg_project_name
67
68
# install old repo version
68
- pip . main (['install' , '-v' , self .get_old_pkg_url ()])
69
+ __main__ (['install' , '-v' , self .get_old_pkg_url ()])
69
70
# check pip installed ok
70
71
nt .assert_in (
71
72
old_pkg_project_name , get_installed_project_names (),
You can’t perform that action at this time.
0 commit comments