Skip to content

Commit 729b316

Browse files
author
Juergen Hasch
committed
Fix pip version changes
1 parent 56ad189 commit 729b316

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ install:
5959
# parent CMD process).
6060
- "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;%PATH%"
6161
# 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)\""
6464
# Upgrade to the latest version of pip to avoid it displaying warnings
6565
# 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'
6767
# install tox
6868
- pip install tox
6969
# install of the actual project is handled by tox in tests

tests/test_migrate.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import nose.tools as nt
1414
import pip
15+
from pip import __main__
1516
from jupyter_contrib_core.testing_utils import (
1617
get_logger, patch_traitlets_app_logs,
1718
)
@@ -65,7 +66,7 @@ def setUp(self):
6566
def install_old_pkg(self):
6667
old_pkg_project_name = self.old_pkg_project_name
6768
# install old repo version
68-
pip.main(['install', '-v', self.get_old_pkg_url()])
69+
__main__(['install', '-v', self.get_old_pkg_url()])
6970
# check pip installed ok
7071
nt.assert_in(
7172
old_pkg_project_name, get_installed_project_names(),

0 commit comments

Comments
 (0)