fix a regular expression for ipython

sdpython · Jan 22, 2015 · 1638673 · 1638673
1 parent 3e5f75d
commit 1638673
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/_unittests/ut_install/test_download.py b/_unittests/ut_install/test_download.py
@@ -69,6 +69,20 @@ def test_install_scikit(self) :
             whl = m.download(temp_folder = temp)
             assert os.path.exists(whl)
 
+    def test_install_ipython(self) :
+        fLOG (__file__, self._testMethodName, OutputPrint = __name__ == "__main__")
+        fold = os.path.abspath(os.path.split(__file__)[0])
+        temp = os.path.join(fold,"temp_download_ipython")
+        if not os.path.exists(temp) : os.mkdir(temp)
+        for _ in os.listdir(temp):
+            if os.path.isfile(os.path.join(temp,_)) :
+                os.remove(os.path.join(temp,_))
+
+        if sys.platform.startswith("win"):
+            m = ModuleInstall("ipython", "wheel", mname="ipython", fLOG=fLOG)
+            whl = m.download(temp_folder = temp)
+            assert os.path.exists(whl)
+
 
 
 

diff --git a/src/pymyinstall/installhelper/module_install.py b/src/pymyinstall/installhelper/module_install.py
@@ -147,7 +147,7 @@ def get_exewheel_url_link(self, file_save = None, wheel = False) :
         if wheel:
             plat = "32" if plat=="win32" else "_amd64"
             pattern = ModuleInstall.expKPageWhl.replace("-cp33-none-win32.whl",
-                                                        "-((cp{1}{2})|(py2[.]py3))-none-((win{0})|(any)).whl".format(plat,sys.version_info.major,sys.version_info.minor))
+                                                        "-((cp{1}{2})|(py2[.]py3)|(py33[.]py34))-none-((win{0})|(any)).whl".format(plat,sys.version_info.major,sys.version_info.minor))
             ind = 3
         else :
             pattern = ModuleInstall.expKPage.replace("win32-py3.3.exe",