Skip to content

Commit feea650

Browse files
committed
.travis.yml: Use existing Java SDK version
Fixes coala#6110
1 parent bcee2cd commit feea650

File tree

10 files changed

+9
-23
lines changed

10 files changed

+9
-23
lines changed

.circleci/config.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2
22
jobs:
3-
python-3.4:
3+
python-3.5:
44
docker:
5-
- image: circleci/python:3.4
5+
- image: circleci/python:3.5
66

77
steps: &build
88
- checkout
@@ -73,15 +73,8 @@ jobs:
7373
- "docs/_build"
7474
- "../.cache/pip"
7575

76-
python-3.5:
77-
docker:
78-
- image: circleci/python:3.5
79-
80-
steps: *build
81-
8276
workflows:
8377
version: 2
8478
test:
8579
jobs:
86-
- python-3.4
8780
- python-3.5

.misc/appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ environment:
2323
matrix:
2424
- PYTHON_VERSION: 3.6
2525
- PYTHON_VERSION: 3.5
26-
- PYTHON_VERSION: 3.4
2726

2827
platform:
2928
- x86

.misc/check_unsupported.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ fi
3232
set -e
3333

3434
# The following is emitted on stdout
35-
grep -q 'coala supports only Python 3.4.* or later' setup.log
35+
grep -q 'coala supports only Python 3.5.* or later' setup.log
3636

3737
echo "Unsupported check completed successfully"

.moban.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ travis_sentinel: true
2222
python_versions:
2323
- 3.6
2424
- 3.5
25-
- 3.4.4
26-
- 3.4.2
2725
# 3.7 excluded due to https://github.com/coala/coala/issues/6028 and others
2826
test_unsupported_python_versions:
2927
- 2.7

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ notifications:
55
email: false
66
python:
77
- 3.5
8-
- 3.4
98

109
stages:
1110
- name: sentinel
@@ -78,7 +77,7 @@ env:
7877
- PATH="$PATH:$TRAVIS_BUILD_DIR/node_modules/.bin"
7978
- BEARS_ZIP_URL=https://codeload.github.com/coala/coala-bears/zip
8079
- GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
81-
- JDK="[email protected].212-04"
80+
- JDK="[email protected].0-212"
8281

8382
cache:
8483
pip: true

coalib/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ def get_version():
2222

2323

2424
def assert_supported_version():
25-
if sys.version_info < (3, 4, 2):
26-
print('coala supports only Python 3.4.2 or later.')
25+
if sys.version_info < (3, 5, 0):
26+
print('coala supports only Python 3.5 or later.')
2727
exit(4)

docs/Developers/Development_Setup.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Using virtualenv
5252
NOTE:
5353
If you have both Python 3 and Python 2 installed try this command
5454
it creates an isolated Python 3 environment called coala-venv
55-
in your current directory, as coala only works for Python >= 3.4.4
55+
in your current directory, as coala only works for Python >= 3.5
5656
::
5757

5858
$ virtualenv coala-venv -p $(which python3)

docs/Developers/Writing_Tests.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ So an example test that succeeds would be:
142142

143143
If some code is untestable, you need to mark your component code
144144
with ``# pragma: no cover``. Important: Provide a reason why your
145-
code is untestable. Code coverage is measured using python 3.4.4 and
146-
3.5 on linux.
145+
code is untestable. Code coverage is measured using python 3.5 on linux.
147146

148147
.. code:: python
149148

setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
'Operating System :: OS Independent',
5454

5555
'Programming Language :: Python :: Implementation :: CPython',
56-
'Programming Language :: Python :: 3.4'
5756
'Programming Language :: Python :: 3.5',
5857
'Programming Language :: Python :: 3.6',
5958
'Programming Language :: Python :: 3 :: Only',

tests/core/ProjectBearTest.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ def test_cache(self):
177177
expected=expected_results1)
178178
# Due to https://bugs.python.org/issue28380, assert_not_called()
179179
# is not available. The fix for this bug was not backported to
180-
# Python 3.5 or earlier, so to be compatible with 3.4.4 we have to
181-
# manually assert.
180+
# Python 3.5 or earlier.
182181
self.assertFalse(mock.called)
183182
self.assertEqual(len(cache), 1)
184183
self.assertEqual(len(next(iter(cache.values()))), 1)

0 commit comments

Comments
 (0)