Skip to content

Commit

Permalink
Merge pull request #170 from cjmartian/fix-tests
Browse files Browse the repository at this point in the history
fix tests
  • Loading branch information
cjmartian committed Oct 19, 2020
2 parents b2e918f + 9c3453d commit de732f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conda_concourse_ci/execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ def compute_builds(path, base_name, folders, matrix_base_dir=None,
try:
with open(build_config_yml) as build_config_file:
build_config_vars = yaml.safe_load(build_config_file)
except (OSError, IOError) as e:
except (OSError, IOError):
print('WARNING :: open(build_config_yml={}) failed'.format(build_config_yml))
pass
for bcv in build_config_vars:
Expand Down Expand Up @@ -679,7 +679,7 @@ def compute_builds(path, base_name, folders, matrix_base_dir=None,

try:
shutil.copytree(os.path.join(path, recipe), out_folder)
except:
except: # noqa
os.system("cp -Rf '{}' '{}'".format(os.path.join(path, recipe), out_folder))

# write the conda_build_config.yml for this particular metadata into that recipe
Expand Down
1 change: 1 addition & 0 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def test_submit_one_off(mocker):
use_staging_channel=False,
automated_pipeline=False,
branches=None,
build_config=None,
stage_for_upload=False,
commit_msg=None,
pr_num=None,
Expand Down

0 comments on commit de732f4

Please sign in to comment.