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: 92385d35dcf2
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: 47a9407e933c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 1, 2015

  1. conda: use source from the current checkout.

    whitequark committed Dec 1, 2015
    Copy the full SHA
    90f6728 View commit details

  2. travis: disable (superseded by our buildbot).

    whitequark committed Dec 1, 2015
    Copy the full SHA
    47a9407 View commit details
Showing with 2 additions and 40 deletions.
  1. +0 −36 .travis.yml
  2. +0 −1 conda/misoc/bld.bat
  3. +2 −3 conda/misoc/meta.yaml
36 changes: 0 additions & 36 deletions .travis.yml
View file

This file was deleted.

1 change: 0 additions & 1 deletion conda/misoc/bld.bat
View file

This file was deleted.

5 changes: 2 additions & 3 deletions conda/misoc/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,13 @@ package:
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}

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

build:
noarch_python: true
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
script: python setup.py install

requirements:
build: