Skip to content

Commit 947c4fe

Browse files
authored
Merge pull request RustPython#1608 from cclauss/patch-2
Travis CI: Matrix -> jobs and Python 3.6 to 3.8
2 parents 2428996 + 7a48ff5 commit 947c4fe

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ before_cache:
99
fi
1010
- rm -rf ~/.cargo/registry/src
1111

12-
matrix:
12+
jobs:
1313
fast_finish: true
1414
include:
1515
- name: Run Rust tests(linux)
@@ -42,7 +42,7 @@ matrix:
4242
# installing rust ourselves is a lot easier than installing Python)
4343
- name: Python test snippets
4444
language: python
45-
python: 3.6
45+
python: 3.8
4646
cache:
4747
- pip
4848
- cargo
@@ -76,7 +76,7 @@ matrix:
7676

7777
- name: Lint Python code with flake8
7878
language: python
79-
python: 3.6
79+
python: 3.8
8080
cache: pip
8181
env: JOBCACHE=9
8282
install: pip install flake8
@@ -134,7 +134,7 @@ matrix:
134134

135135
- name: Code Coverage
136136
language: python
137-
python: 3.6
137+
python: 3.8
138138
cache:
139139
- pip
140140
- cargo

tests/Pipfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ pytest = "*"
1010
[dev-packages]
1111

1212
[requires]
13-
python_version = "3.6"

tests/snippets/math_basics.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@
4949
assert_raises(TypeError, pow, 2, 4, 5.0)
5050
assert_raises(TypeError, pow, 2, 4.0, 5)
5151
assert_raises(TypeError, pow, 2.0, 4, 5)
52-
assert_raises(ValueError, pow, 2, -1, 5)
52+
from sys import version_info
53+
if version_info < (3, 8):
54+
assert_raises(ValueError, pow, 2, -1, 5)
55+
else: # https://docs.python.org/3/whatsnew/3.8.html#other-language-changes
56+
assert pow(2, -1, 5) == 3
5357
assert_raises(ValueError, pow, 2, 2, 0)
5458

5559
# bitwise

0 commit comments

Comments
 (0)