Skip to content

Commit

Permalink
Merge pull request #189 from janschulz/config_batches
Browse files Browse the repository at this point in the history
Make the badge URLs configureable
  • Loading branch information
pelson committed Jun 1, 2016
2 parents 14c13aa + 6cc7136 commit 211505a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ def main(forge_file_directory):
'circle': {},
'appveyor': {},
'channels': {'sources': ['conda-forge'], 'targets': [['conda-forge', 'main']]},
'github': {'user_or_org': 'conda-forge', 'repo_name': ''},
'recipe_dir': recipe_dir}
forge_dir = os.path.abspath(forge_file_directory)

Expand All @@ -326,6 +327,8 @@ def main(forge_file_directory):
if isinstance(value, dict):
config_item.update(value)
config['package'] = meta = meta_of_feedstock(forge_file_directory)
if not config['github']['repo_name']:
config['github']['repo_name'] = meta.name()+'-feedstock'

tmplt_dir = os.path.join(conda_forge_content, 'templates')
# Load templates from the feedstock in preference to the smithy's templates.
Expand Down
8 changes: 4 additions & 4 deletions conda_smithy/templates/README.md.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ Terminology

Current build status
====================
{% set appveyor_name = package.name().replace('_', '-').replace('.', '-') %}
Linux: [![Circle CI](https://circleci.com/gh/conda-forge/{{package.name()}}-feedstock.svg?style=svg)](https://circleci.com/gh/conda-forge/{{package.name()}}-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/{{package.name()}}-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/{{package.name()}}-feedstock)
Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/{{appveyor_name}}-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/{{appveyor_name}}-feedstock/branch/master)
{% set appveyor_name = github.repo_name.replace('_', '-').replace('.', '-') %}
Linux: [![Circle CI](https://circleci.com/gh/{{github.user_or_org}}/{{github.repo_name}}.svg?style=svg)](https://circleci.com/gh/{{github.user_or_org}}/{{github.repo_name}})
OSX: [![TravisCI](https://travis-ci.org/{{github.user_or_org}}/{{github.repo_name}}.svg?branch=master)](https://travis-ci.org/{{github.user_or_org}}/{{github.repo_name}})
Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/{{github.user_or_org}}/{{appveyor_name}}?svg=True)](https://ci.appveyor.com/project/{{github.user_or_org}}/{{appveyor_name}}/branch/master)

Current release info
====================
Expand Down

0 comments on commit 211505a

Please sign in to comment.