Add Python 3.7 and 3.8 to CI and install scons

Author: nicoddemus

.gitignore

@@ -1,11 +1,13 @@
+*.egg-info/
 *.exe
+*.o
 *.obj
-*.pyc
 *.pdb
-*.o
-*.egg-info/
+*.pyc
 .cache/
+.coverage
+.eggs/
 .sconsign.dblite
-dist/
+.tox/
 build/
-.coverage
+dist/

.travis.yml

@@ -10,9 +10,12 @@ jobs:
       python: '3.5'
     - env: TOXENV=py36
       python: '3.6'
+    - env: TOXENV=py37
+      python: '3.7'
+    - env: TOXENV=py38
+      python: '3.8'
     - stage: deploy
-      python: '3.6'
-      env:
+      python: '3.8'
       install: pip install -U setuptools setuptools_scm
       script: skip
       deploy:
@@ -33,7 +36,7 @@ install:
  - tar -zxvf release-1.8.0.tar.gz
  - "cd googletest-release-1.8.0/googletest && cmake . && sudo make install; cd -"
  - rm -rf googletest-release-1.8.0
- - pip install tox coveralls
+ - pip install tox coveralls scons
 
 script:
  - scons -j4 -C tests

setup.py

@@ -31,6 +31,8 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: C++',
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Software Development :: Testing',

tests/acceptance/boosttest-samples/SConscript

@@ -1,6 +1,6 @@
 Import('env')
 
-tests = range(1, 13+1)
+tests = list(range(1, 13+1))
 tests.remove(9)
 tests.remove(10)
 tests.remove(12)

tests/test_pytest_cpp.py

@@ -246,18 +246,18 @@ def test_cpp_files_option(testdir, exes):
     exes.get('boost_success')
     exes.get('gtest')
 
-    result = testdir.inline_run('--collect-only')
-    reps = result.getreports()
-    assert len(reps) == 1
-    assert reps[0].result == []
+    result = testdir.runpytest('--collect-only')
+    result.stdout.fnmatch_lines('* no tests ran *')
 
     testdir.makeini('''
         [pytest]
         cpp_files = gtest* boost*
     ''')
-    result = testdir.inline_run('--collect-only')
-    assert len(result.matchreport(exes.exe_name('boost_success')).result) == 1
-    assert len(result.matchreport(exes.exe_name('gtest')).result) == 4
+    result = testdir.runpytest('--collect-only')
+    result.stdout.fnmatch_lines([
+        "*CppFile boost_success*",
+        "*CppFile gtest*",
+    ])
 
 
 def test_google_one_argument(testdir, exes):

tox.ini

@@ -1,8 +1,9 @@
 [tox]
-envlist = py{27,34,35,36}
+envlist = py{27,34,35,36,37,38}
 
 [testenv]
-deps=pytest
+deps=
+    pytest
     pytest-mock
     pytest-xdist
     coverage