Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into GUI

  • Loading branch information...
commit 92cc40d0568bc4b955c53726f21f6c3541686fa3 2 parents 9cb129f + 84cbd80
@Kenneth-T-Moore Kenneth-T-Moore authored
View
1  config/testhosts.cfg
@@ -144,4 +144,3 @@ test_release: true
#test_branch: true
-
View
2  openmdao.devtools/src/openmdao/devtools/remotetst.py
@@ -72,7 +72,7 @@ def _remote_build_and_test(fname=None, pyversion='python', keep=False,
if pull_docs:
if result.return_code == 0:
print "pulling docs from %s" % hostname
- retrieve_docs(remotedir)
+ retrieve_docs(os.path.join('~', remotedir))
print "doc retrieval successful"
else:
print "not pulling docs from %s because test failed" % hostname
View
9 openmdao.devtools/src/openmdao/devtools/utils.py
@@ -306,13 +306,14 @@ def retrieve_docs(remote_dir):
"""Retrieve a tar file of the docs built on a remote machine."""
cmds = [ "import tarfile",
"import os",
- "for fname in os.listdir('%s'):" % remote_dir,
+ "remote_dir = os.path.expanduser('%s')" % remote_dir,
+ "for fname in os.listdir(remote_dir):",
" if '-OpenMDAO-Framework-' in fname and not fname.endswith('.gz'):",
" break",
"else:",
- " raise RuntimeError('install dir not found in %%s' %% os.path.join(os.getcwd(),'%s'))" % remote_dir,
- "tardir = os.path.join('%s', fname, 'docs', '_build', 'html')" % remote_dir,
- "tar = tarfile.open(os.path.join('%s','html.tar.gz'), mode='w:gz')" % remote_dir,
+ " raise RuntimeError('install dir not found in %s' % remote_dir)",
+ "tardir = os.path.join(remote_dir, fname, 'docs', '_build', 'html')",
+ "tar = tarfile.open(os.path.join(remote_dir, 'html.tar.gz'), mode='w:gz')",
"tar.add(tardir, arcname='html')",
"tar.close()",
]
Please sign in to comment.
Something went wrong with that request. Please try again.