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: 6c01f80fc5a6
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: 70e328057974
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 4, 2015

  1. travis: python 3.5

    @sbourdeauducq
    sbourdeauducq committed Oct 4, 2015

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    nomadium Miguel Landaeta
    GPG key ID: AFB8E0FC9231CC6D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6258257 View commit details

  2. travis: activate py35

    @sbourdeauducq
    sbourdeauducq committed Oct 4, 2015

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    nomadium Miguel Landaeta
    GPG key ID: AFB8E0FC9231CC6D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b1f8aa2 View commit details

  3. travis/conda: build for python 3.5

    @sbourdeauducq
    sbourdeauducq committed Oct 4, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    70e3280 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 .travis.yml
6 changes: 3 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
python:
- "3.4"
- "3.5"

env:
global:
@@ -11,7 +11,7 @@ before_install:
- wget https://raw.githubusercontent.com/m-labs/artiq/master/.travis/get-anaconda.sh
- chmod +x get-anaconda.sh
- ./get-anaconda.sh
- source $HOME/miniconda/bin/activate py34
- source $HOME/miniconda/bin/activate py35
- conda install anaconda-client numpydoc
install:
# Install iverilog package.
@@ -25,7 +25,7 @@ install:
- "sudo apt-get install verilator"
- "verilator --version; true"
# Build and install Migen conda package
- "conda build conda/migen"
- "conda build --python 3.5 conda/migen"
- "conda install migen --use-local"

script: