Skip to content

Commit

Permalink
travis/appveyor: using pip inside ci.py to install py2/py3 mbuild
Browse files Browse the repository at this point in the history
Change-Id: I057cb212dedd7d8b22866d85de8afc025383e00a
  • Loading branch information
mjcharne committed Jun 13, 2017
1 parent 044d576 commit 4a58e9f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ matrix:
os: osx

script:
- pip install --user https://github.com/intelxed/mbuild/zipball/master
- python ci.py
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
build: off

test_script:
- pip install --user https://github.com/intelxed/mbuild/zipball/master
- python ci.py
11 changes: 7 additions & 4 deletions ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
def get_python_cmds():
if platform.system() == 'Windows':
lst = []
#pyvers = ['27','35']
pyvers = ['27']
pyvers = ['27','35']
#pyvers = ['27']
for pyver in pyvers:
pycmd = 'C:/python{}/python'.format(pyver)
lst.append((pyver,pycmd))
return lst
elif platform.system() == 'Linux':
lst = []
#pyvers = ['2.7','3.5.2']
pyvers = ['2.7']
pyvers = ['2.7','3.5.2']
#pyvers = ['2.7']
for pyver in pyvers:
pycmd = '/opt/python/{}/bin/python'.format(pyver)
lst.append((pyver,pycmd))
Expand All @@ -24,6 +24,9 @@ def get_python_cmds():


for pyver,pycmd in get_python_cmds():
cmd = '{} -m pip install --user https://github.com/intelxed/mbuild/zipball/master'.format(pycmd)
print(cmd)
subprocess.check_call(cmd, shell=True)
for size in ['ia32','x86-64']:
for linkkind,link in [('dfltlink',''),('dynamic','--shared')]:
build_dir = '{}-{}-{}'.format(pyver, size, linkkind)
Expand Down

0 comments on commit 4a58e9f

Please sign in to comment.