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: 380e60af55aa
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: acfbcb28ca5f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 22, 2015

  1. conda: put git hash back build string.

    whitequark committed Oct 22, 2015
    Copy the full SHA
    051350e View commit details

  2. conda: restrict python to 3.5.* explicitly.

    whitequark committed Oct 22, 2015
    Copy the full SHA
    acfbcb2 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 conda/migen/meta.yaml
8 changes: 4 additions & 4 deletions conda/migen/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: migen
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/migen
@@ -9,14 +9,14 @@ source:
build:
noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ 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:
build:
- python
- python 3.5.*
run:
- python
- python 3.5.*

test:
imports: