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/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2bbcc218f36a
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ecd04cf68cc8
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 21, 2015

  1. conda: include hash in commit.

    whitequark committed Oct 21, 2015
    Copy the full SHA
    11d072b View commit details

  2. conda: build migen as noarch.

    whitequark committed Oct 21, 2015
    Copy the full SHA
    d718d1b View commit details

  3. travis: install the package that was just built. 

    Otherwise, conda will select a newer remote version if available,
even with --use-local.
    whitequark committed Oct 21, 2015
    Copy the full SHA
    5dc26ea View commit details

  4. travis: upload noarch conda package correctly.

    whitequark committed Oct 21, 2015
    Copy the full SHA
    ecd04cf View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 .travis.yml
  2. +3 −3 conda/migen/meta.yaml
6 changes: 3 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ install:
- "mkdir -p /home/travis/miniconda/conda-bld/linux-64"
- "conda index /home/travis/miniconda/conda-bld/linux-64"
- "conda build --python 3.5 conda/migen"
- "conda install migen --use-local"
- "conda install $(conda build --output --python 3.5 conda/migen)"

script:
# Run tests
@@ -39,8 +39,8 @@ script:

after_success:
# Upload Migen conda package to binstar
- anaconda login --hostname $(hostname) --username $binstar_login --password $binstar_password
- anaconda upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/migen-*.tar.bz2
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then anaconda login --hostname $(hostname) --username $binstar_login --password $binstar_password; fi
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then anaconda upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/noarch/migen-*.tar.bz2; fi

notifications:
email: false
6 changes: 3 additions & 3 deletions conda/migen/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package:
name: migen
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.{{ environ.get("GIT_DESCRIBE_HASH") }}

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

build:
noarch_python: True
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
noarch_python: true
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
script: $PYTHON setup.py install

requirements: