##// END OF EJS Templates
Merge pull request #1758 from Carreau/test_pr...
Bussonnier Matthias -
r7067:b864a119 merge
parent child Browse files
Show More
@@ -27,6 +27,7 b' import gh_api'
27 basedir = os.path.join(os.path.expanduser("~"), ".ipy_pr_tests")
27 basedir = os.path.join(os.path.expanduser("~"), ".ipy_pr_tests")
28 repodir = os.path.join(basedir, "ipython")
28 repodir = os.path.join(basedir, "ipython")
29 ipy_repository = 'git://github.com/ipython/ipython.git'
29 ipy_repository = 'git://github.com/ipython/ipython.git'
30 ipy_http_repository = 'http://github.com/ipython/ipython.git'
30 gh_project="ipython/ipython"
31 gh_project="ipython/ipython"
31
32
32 supported_pythons = ['python2.6', 'python2.7', 'python3.1', 'python3.2']
33 supported_pythons = ['python2.6', 'python2.7', 'python3.1', 'python3.2']
@@ -65,10 +66,16 b' def setup():'
65
66
66 # Check out and update the repository
67 # Check out and update the repository
67 if not os.path.exists('ipython'):
68 if not os.path.exists('ipython'):
68 check_call(['git', 'clone', ipy_repository])
69 try :
70 check_call(['git', 'clone', ipy_repository])
71 except CalledProcessError :
72 check_call(['git', 'clone', ipy_http_repository])
69 os.chdir(repodir)
73 os.chdir(repodir)
70 check_call(['git', 'checkout', 'master'])
74 check_call(['git', 'checkout', 'master'])
71 check_call(['git', 'pull', ipy_repository, 'master'])
75 try :
76 check_call(['git', 'pull', ipy_repository, 'master'])
77 except CalledProcessError :
78 check_call(['git', 'pull', ipy_http_repository, 'master'])
72 os.chdir(basedir)
79 os.chdir(basedir)
73
80
74 missing_libs_re = re.compile(r"Tools and libraries NOT available at test time:\n"
81 missing_libs_re = re.compile(r"Tools and libraries NOT available at test time:\n"
General Comments 0
You need to be logged in to leave comments. Login now