Skip to content

Commit 688747e

Browse files
authored
[test] Investigate failure in CI (#349)
* trigger CI * verbose tox * list versions * do not fail fast * show pylint output * force pylint version * reorder deps * pylint version * conditional on python version * changes not needed * move py35 to py36 * revert change
1 parent 4062edf commit 688747e

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.ci/Jenkinsfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,22 @@ pipeline {
7171
stage("Linux") {
7272
failFast true
7373
parallel {
74-
stage('Linux - py35') {
74+
stage('Linux - py36') {
7575
agent {
7676
label 'Linux'
7777
}
7878
stages {
79-
stage('Linux - py35 - Generate environment') {
79+
stage('Linux - py36 - Generate environment') {
8080
environment {
81-
PYVER = 'py35'
81+
PYVER = 'py36'
8282
}
8383
steps {
8484
sh '.ci/generate_env_linux.sh'
8585
}
8686
}
87-
stage('Linux - py35 - conandev') {
87+
stage('Linux - py36 - conandev') {
8888
environment {
89-
TOXENV = 'py35-conandev'
89+
TOXENV = 'py36-conandev'
9090
}
9191
steps {
9292
sh '''
@@ -96,9 +96,9 @@ pipeline {
9696
'''
9797
}
9898
}
99-
stage('Linux - py35 - conancurrent') {
99+
stage('Linux - py36 - conancurrent') {
100100
environment {
101-
TOXENV = 'py35-conancurrent'
101+
TOXENV = 'py36-conancurrent'
102102
}
103103
steps {
104104
sh '''

tests/requirements_test.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ pytest>=3.6
22
parameterized
33
responses
44
pluggy==0.11.0
5-
pylint
5+
pylint==2.10.2; python_version >= '3.0'
6+
pylint==1.9.5; python_version == '2.7'
67
astroid
78
spdx_lookup

tox.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
skipsdist=True
33
envlist =
4-
py{27,35,37,38}-conan{dev,current,prev,prevprev}
4+
py{27,36,37,38}-conan{dev,current,prev,prevprev}
55

66
[testenv]
77
deps =
@@ -11,6 +11,7 @@ deps =
1111
conanprevprev: conan-unknown
1212
coverage: coverage-enable-subprocess
1313
-r {toxinidir}/tests/requirements_test.txt
14+
1415

1516
setenv =
1617
PYTHONDONTWRITEBYTECODE=1
@@ -25,6 +26,8 @@ setenv =
2526
passenv = PYTEST_ADDOPTS USE_UNSUPPORTED_CONAN_WITH_PYTHON_2
2627

2728
commands =
29+
python --version
30+
conan --version
2831
coverage: coverage erase
2932
{env:PYTEST_TEST_RUNNER:pytest} {posargs:tests}
3033
coverage: coverage combine

0 commit comments

Comments
 (0)