Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e85f1313384
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0cf4665d3aa7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 2, 2015

  1. conda: consistent version numbering

    @sbourdeauducq
    sbourdeauducq committed Nov 2, 2015
    Copy the full SHA
    851067b View commit details

  2. travis: add dummy script

    @sbourdeauducq
    sbourdeauducq committed Nov 2, 2015
    Copy the full SHA
    0cf4665 View commit details
Showing with 5 additions and 2 deletions.
  1. +2 −0 .travis.yml
  2. +3 −2 conda/misoc/meta.yaml
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ install:
- "conda index /home/travis/miniconda/conda-bld/linux-64"
- "conda build --python 3.5 conda/misoc"
- "conda install $(conda build --output --python 3.5 conda/misoc)"
script:
- true

after_success:
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then anaconda login --hostname $(hostname) --username $binstar_login --password $binstar_password; fi
5 changes: 3 additions & 2 deletions conda/misoc/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package:
name: misoc
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.{{ environ.get("GIT_DESCRIBE_HASH") }}
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}

source:
git_url: https://github.com/m-labs/misoc
git_tag: new

build:
noarch_python: true
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}
script: $PYTHON setup.py install

requirements: