Skip to content

Commit 2eac96e

Browse files
author
Cruz Monrreal
authored
Merge pull request #6433 from cmonr/python3-in-travisci
Enabl-able Python 3 tools testing in Travis CI
2 parents 5ce26b1 + 8b66182 commit 2eac96e

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

.travis.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
2-
python:
3-
'2.7'
2+
python: 2.7
43

54
env:
65
global:
@@ -30,6 +29,7 @@ before_install:
3029
- sudo ln -s $HOME/.cache/apt /var/cache/apt/archives
3130
# Setup ppa to make sure arm-none-eabi-gcc is correct version
3231
- sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
32+
- sudo add-apt-repository -y ppa:deadsnakes/ppa
3333
# Loop until update succeeds (timeouts can occur)
3434
- travis_retry $(! sudo apt-get update 2>&1 |grep Failed)
3535

@@ -72,14 +72,16 @@ matrix:
7272
find -name "*.s" | tee BUILD/badasm |
7373
sed -e "s/^/Bad Assembler file name found: /" && [ ! -s BUILD/badasm ]
7474
75-
- env:
76-
- NAME=tools
75+
- &tools-pytest
76+
env: NAME=tools-py2.7
77+
python: 2.7
7778
install:
7879
# Install dependencies
7980
- sudo apt-get install gcc-arm-embedded
8081
- pip install -r requirements.txt
8182
- pip install pytest pylint hypothesis mock coverage coveralls
8283
# Print versions we use
84+
8385
- arm-none-eabi-gcc --version
8486
- python --version
8587
script:
@@ -94,6 +96,14 @@ matrix:
9496
# Report success since we have overridden default behaviour
9597
- bash -c "$STATUS" success "Local $NAME testing has passed"
9698

99+
# - <<: *tools-pytest
100+
# env: NAME=tools-py3.5
101+
# python: 3.5
102+
#
103+
# - <<: *tools-pytest
104+
# env: NAME=tools-py3.6
105+
# python: 3.6
106+
97107
- env:
98108
- NAME=astyle
99109
install:

0 commit comments

Comments
 (0)