Skip to content

Commit

Permalink
Merge pull request #1 from conda-forge-admin/feedstock_rerender_master
Browse files Browse the repository at this point in the history
MNT: Re-render the feedstock [ci skip]
  • Loading branch information
basnijholt authored Mar 21, 2017
2 parents 465ecf8 + c4175ff commit 1690cd9
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 221 deletions.
43 changes: 0 additions & 43 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BSD 3-clause license
Copyright (c) conda-forge
Copyright (c) 2015-2017, conda-forge
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ degrees of freedom is controllable by computer.
Current build status
====================

Linux: [![Circle CI](https://circleci.com/gh/conda-forge/qcodes-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/qcodes-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/qcodes-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/qcodes-feedstock)
Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/qcodes-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/qcodes-feedstock/branch/master)
Linux: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg)
OSX: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg)
Windows: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg)

Current release info
====================
Expand Down
76 changes: 0 additions & 76 deletions appveyor.yml

This file was deleted.

27 changes: 0 additions & 27 deletions ci_support/checkout_merge_commit.sh

This file was deleted.

56 changes: 0 additions & 56 deletions ci_support/run_docker_build.sh

This file was deleted.

21 changes: 6 additions & 15 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
checkout:
post:
- ./ci_support/checkout_merge_commit.sh

machine:
services:
- docker

dependencies:
# Note, we used to use the naive caching of docker images, but found that it was quicker
# just to pull each time. #rollondockercaching
override:
- docker pull condaforge/linux-anvil
general:
branches:
ignore:
- /.*/

test:
override:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
- ./ci_support/run_docker_build.sh
# The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
- exit 0

0 comments on commit 1690cd9

Please sign in to comment.