Merge pull request #93 from keisukefukuda/fix-pip-version

fix for pip >=18

.travis.yml

@@ -5,12 +5,25 @@ sudo: false
 dist: trusty
 
 env:
-  - TEST_SHELL_CMD=zsh  LANG=C
-  - TEST_SHELL_CMD=bash LANG=en_US.utf-8
-  - TEST_SHELL_CMD=zsh  LANG=ja_JP.utf-8
-  - TEST_SHELL_CMD=bash LANG=C
-  - TEST_SHELL_CMD=zsh  LANG=en_US.utf-8
-  - TEST_SHELL_CMD=bash LANG=ja_JP.utf-8
+  - PIP_VER=9.0.1  TEST_SHELL_CMD=zsh   LANG=C
+  - PIP_VER=9.0.1  TEST_SHELL_CMD=zsh   LANG=en_US.utf-8
+  - PIP_VER=9.0.1  TEST_SHELL_CMD=zsh   LANG=ja_JP.utf-8
+  - PIP_VER=9.0.1  TEST_SHELL_CMD=bash  LANG=C
+  - PIP_VER=9.0.1  TEST_SHELL_CMD=bash  LANG=en_US.utf-8
+  - PIP_VER=9.0.1  TEST_SHELL_CMD=bash  LANG=ja_JP.utf-8
+  - PIP_VER=10.0.1 TEST_SHELL_CMD=zsh   LANG=C
+  - PIP_VER=10.0.1 TEST_SHELL_CMD=zsh   LANG=en_US.utf-8
+  - PIP_VER=10.0.1 TEST_SHELL_CMD=zsh   LANG=ja_JP.utf-8
+  - PIP_VER=10.0.1 TEST_SHELL_CMD=bash  LANG=C
+  - PIP_VER=10.0.1 TEST_SHELL_CMD=bash  LANG=en_US.utf-8
+  - PIP_VER=10.0.1 TEST_SHELL_CMD=bash  LANG=ja_JP.utf-8
+  - PIP_VER=18.0   TEST_SHELL_CMD=zsh   LANG=C
+  - PIP_VER=18.0   TEST_SHELL_CMD=zsh   LANG=en_US.utf-8
+  - PIP_VER=18.0   TEST_SHELL_CMD=zsh   LANG=ja_JP.utf-8
+  - PIP_VER=18.0   TEST_SHELL_CMD=bash  LANG=C
+  - PIP_VER=18.0   TEST_SHELL_CMD=bash  LANG=en_US.utf-8
+  - PIP_VER=18.0   TEST_SHELL_CMD=bash  LANG=ja_JP.utf-8
+
 
 python:
   # - "2.6"
@@ -21,9 +34,8 @@ python:
   - 3.5
   # - "3.5-dev" # 3.5 development branch
   - 3.6
-  # - "3.6-dev" # 3.6 development branch
-  # - "3.7-dev" # 3.7 development branch
-  # - "nightly" # currently points to 3.7-dev
+  - 3.7-dev
+  - "nightly"
 
 cache:
   - pip: true
@@ -52,6 +64,7 @@ before_script:
   - echo # sh ./.travis_install.sh
 
 install:
+  - pip install "pip==${PIP_VER}"
   - pip install -r requirements.txt
 
 script:

mpienv/pip.py

@@ -22,12 +22,13 @@ def _get_pip_ver():
     m = re.match(r'pip (\S+)', util.decode(out))
     ver = m.group(1)
 
-    if ver.startswith("1.5"):
+    m = re.match(r'(\d+)[.](\S+)', ver)
+    major_ver = int(m.group(1))
+
+    if major_ver >= 9:
+        _pip_ver = str(major_ver)
+    elif ver.startswith("1.5"):
         _pip_ver = '1.5'
-    elif ver.startswith("9"):
-        _pip_ver = '9'
-    elif ver.startswith("10"):
-        _pip_ver = '10'
     else:
         raise RuntimeError("Error: Unsupported pip version")