File tree Expand file tree Collapse file tree 5 files changed +83
-12
lines changed Expand file tree Collapse file tree 5 files changed +83
-12
lines changed Original file line number Diff line number Diff line change @@ -3,24 +3,23 @@ language: python
3
3
matrix :
4
4
include :
5
5
- python : 2.6
6
- env : TOXENV=py26
6
+ env : TEST_TYPE=test
7
7
- python : 2.7
8
- env : TOXENV=py27
8
+ env : TEST_TYPE=test
9
+ - python : 2.7
10
+ env : TEST_TYPE=check
9
11
- python : 3.3
10
- env : TOXENV=py33
12
+ env : TEST_TYPE=test
11
13
- python : 3.4
12
- env : TOXENV=py34
14
+ env : TEST_TYPE=test
13
15
- python : 3.5
14
- env : TOXENV=py35
16
+ env : TEST_TYPE=test
15
17
- python : 3.6
16
- env : TOXENV=py36
18
+ env : TEST_TYPE=test
17
19
18
20
sudo : false
19
21
install :
20
- - travis_retry pip install tox
21
- - if [[ $TOXENV == 'py27' ]]; then pip install -r requirements-dev.txt; pip install -e .; fi
22
+ - if [[ $TEST_TYPE == 'check' ]]; then pip install -r requirements-dev.txt; fi
23
+ - python scripts/ci/ install
22
24
script :
23
- - tox
24
- # We only need to run the lint/flake8 checks on one version of python
25
- # So I've arbitrarily chosen python2.7.
26
- - if [[ $TOXENV == 'py27' ]]; then make check; fi
25
+ - make $TEST_TYPE
Original file line number Diff line number Diff line change @@ -31,12 +31,16 @@ check:
31
31
#
32
32
pylint --rcfile .pylintrc -E awsshell
33
33
34
+ test :
35
+ python scripts/ci/run-tests
36
+
34
37
pylint :
35
38
# ##### PYLINT ######
36
39
# Python linter. This will generally not have clean output.
37
40
# So you'll need to manually verify this output.
38
41
#
39
42
#
40
43
pylint --rcfile .pylintrc awsshell
44
+
41
45
coverage :
42
46
py.test --cov awsshell --cov-report term-missing tests/
Original file line number Diff line number Diff line change
1
+ #!/usr/bin/env python
2
+ import os
3
+ import sys
4
+ from subprocess import check_call
5
+ import shutil
6
+
7
+ _dname = os .path .dirname
8
+
9
+ REPO_ROOT = _dname (_dname (_dname (os .path .abspath (__file__ ))))
10
+ os .chdir (REPO_ROOT )
11
+
12
+
13
+ def run (command ):
14
+ return check_call (command , shell = True )
15
+
16
+
17
+ try :
18
+ # Has the form "major.minor"
19
+ python_version = os .environ ['PYTHON_VERSION' ]
20
+ except KeyError :
21
+ python_version = '.' .join ([str (i ) for i in sys .version_info [:2 ]])
22
+
23
+ run ('pip install -r requirements-test.txt' )
24
+ if os .path .isdir ('dist' ) and os .listdir ('dist' ):
25
+ shutil .rmtree ('dist' )
26
+ run ('python setup.py bdist_wheel' )
27
+ wheel_dist = os .listdir ('dist' )[0 ]
28
+ run ('pip install %s' % (os .path .join ('dist' , wheel_dist )))
Original file line number Diff line number Diff line change
1
+ #!/usr/bin/env python
2
+ # Don't run tests from the root repo dir.
3
+ # We want to ensure we're importing from the installed
4
+ # binary package not from the CWD.
5
+
6
+ import os
7
+ from subprocess import check_call
8
+
9
+ _dname = os .path .dirname
10
+
11
+ REPO_ROOT = _dname (_dname (_dname (os .path .abspath (__file__ ))))
12
+ os .chdir (os .path .join (REPO_ROOT , 'tests' ))
13
+
14
+
15
+ def run (command ):
16
+ return check_call (command , shell = True )
17
+
18
+
19
+ run ('py.test --cov awsshell --junitxml=./pytests.xml --cov-report term-missing'
20
+ ' integration/' )
Original file line number Diff line number Diff line change
1
+ #!/usr/bin/env python
2
+ # Don't run tests from the root repo dir.
3
+ # We want to ensure we're importing from the installed
4
+ # binary package not from the CWD.
5
+
6
+ import os
7
+ from subprocess import check_call
8
+
9
+ _dname = os .path .dirname
10
+
11
+ REPO_ROOT = _dname (_dname (_dname (os .path .abspath (__file__ ))))
12
+ os .chdir (os .path .join (REPO_ROOT , 'tests' ))
13
+
14
+
15
+ def run (command ):
16
+ return check_call (command , shell = True )
17
+
18
+
19
+ run ('py.test --cov awsshell --junitxml=./pytests.xml --cov-report term-missing'
20
+ ' unit/' )
You can’t perform that action at this time.
0 commit comments