Skip to content

Commit

Permalink
Trying to get Travis working on PR
Browse files Browse the repository at this point in the history
  • Loading branch information
danielparton committed Aug 13, 2015
1 parent 03a3405 commit 1540144
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
1 change: 1 addition & 0 deletions devtools/travis-ci/test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This installs the program and runs unit tests
set -e
conda config --add channels https://conda.anaconda.org/omnia
conda build devtools/conda-recipe
conda install --yes --use-local ensembler-dev
Expand Down
13 changes: 4 additions & 9 deletions ensembler/initproject.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,10 @@ def _write_manual_overrides_file(self):
template_manual_overrides_filepath = get_installed_resource_filename(
os.path.join('resources', 'template-manual-overrides.yaml')
)
try:
with open(template_manual_overrides_filepath) as template_manual_overrides_file:
with open(manual_overrides_filename, 'w') as manual_overrides_file:
manual_overrides_file.write(template_manual_overrides_file.read())
except:
logger.warn('Problem writing manual overrides file from {} to {}'.format(
template_manual_overrides_filepath, os.path.abspath(manual_overrides_filename))
)
raise
manual_overrides_filepath = os.path.join(
self.project_toplevel_dir, manual_overrides_filename
)
shutil.copy(template_manual_overrides_filepath, manual_overrides_filepath)

def _write_init_metadata(self):
project_metadata = ensembler.core.ProjectMetadata(project_stage='init', project_toplevel_dir=self.project_toplevel_dir)
Expand Down

0 comments on commit 1540144

Please sign in to comment.