Skip to content

Commit 95df534

Browse files
authored
Add Python 3.7 and 3.8 to CI and install scons (#43)
Add Python 3.7 and 3.8 to CI and install scons
2 parents 1c8bec0 + 16f10e7 commit 95df534

7 files changed

Lines changed: 30 additions & 21 deletions

File tree

.gitignore

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
*.egg-info/
12
*.exe
3+
*.o
24
*.obj
3-
*.pyc
45
*.pdb
5-
*.o
6-
*.egg-info/
6+
*.pyc
77
.cache/
8+
.coverage
9+
.eggs/
810
.sconsign.dblite
9-
dist/
11+
.tox/
1012
build/
11-
.coverage
13+
dist/

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ jobs:
44
include:
55
- env: TOXENV=py27
66
python: '2.7'
7-
- env: TOXENV=py34
8-
python: '3.4'
97
- env: TOXENV=py35
108
python: '3.5'
119
- env: TOXENV=py36
1210
python: '3.6'
11+
- env: TOXENV=py37
12+
python: '3.7'
13+
- env: TOXENV=py38
14+
python: '3.8'
1315
- stage: deploy
14-
python: '3.6'
15-
env:
16+
python: '3.8'
1617
install: pip install -U setuptools setuptools_scm
1718
script: skip
1819
deploy:
@@ -33,7 +34,7 @@ install:
3334
- tar -zxvf release-1.8.0.tar.gz
3435
- "cd googletest-release-1.8.0/googletest && cmake . && sudo make install; cd -"
3536
- rm -rf googletest-release-1.8.0
36-
- pip install tox coveralls
37+
- pip install tox coveralls scons
3738

3839
script:
3940
- scons -j4 -C tests

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.2.0
2+
3+
- `pytest-cpp` no longer supports Python 3.4.
4+
15
# 1.1.0
26

37
- New `cpp_arguments` ini option allows customization of the command-line

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
'Programming Language :: Python :: 2',
2929
'Programming Language :: Python :: 2.7',
3030
'Programming Language :: Python :: 3',
31-
'Programming Language :: Python :: 3.4',
3231
'Programming Language :: Python :: 3.5',
3332
'Programming Language :: Python :: 3.6',
33+
'Programming Language :: Python :: 3.7',
34+
'Programming Language :: Python :: 3.8',
3435
'Programming Language :: C++',
3536
'Topic :: Software Development :: Quality Assurance',
3637
'Topic :: Software Development :: Testing',

tests/acceptance/boosttest-samples/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Import('env')
22

3-
tests = range(1, 13+1)
3+
tests = list(range(1, 13+1))
44
tests.remove(9)
55
tests.remove(10)
66
tests.remove(12)

tests/test_pytest_cpp.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,18 +246,18 @@ def test_cpp_files_option(testdir, exes):
246246
exes.get('boost_success')
247247
exes.get('gtest')
248248

249-
result = testdir.inline_run('--collect-only')
250-
reps = result.getreports()
251-
assert len(reps) == 1
252-
assert reps[0].result == []
249+
result = testdir.runpytest('--collect-only')
250+
result.stdout.fnmatch_lines('* no tests ran *')
253251

254252
testdir.makeini('''
255253
[pytest]
256254
cpp_files = gtest* boost*
257255
''')
258-
result = testdir.inline_run('--collect-only')
259-
assert len(result.matchreport(exes.exe_name('boost_success')).result) == 1
260-
assert len(result.matchreport(exes.exe_name('gtest')).result) == 4
256+
result = testdir.runpytest('--collect-only')
257+
result.stdout.fnmatch_lines([
258+
"*CppFile boost_success*",
259+
"*CppFile gtest*",
260+
])
261261

262262

263263
def test_google_one_argument(testdir, exes):

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[tox]
2-
envlist = py{27,34,35,36}
2+
envlist = py{27,35,36,37,38}
33

44
[testenv]
5-
deps=pytest
5+
deps=
6+
pytest
67
pytest-mock
78
pytest-xdist
89
coverage

0 commit comments

Comments
 (0)