Skip to content

Commit 9d31567

Browse files
authored
Merge pull request #39 from codacy/use-python-36
Use python 3.6
2 parents 1dd1d92 + c648eff commit 9d31567

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

build.sbt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,25 @@ version in Docker := "1.0"
2424
organization := "com.codacy"
2525

2626
val installAll =
27-
s"""apt-get update &&
28-
|apt-get -y install python2.7 python3.5 ca-certificates wget openjdk-8-jre-headless &&
27+
s"""apt-get -y update &&
28+
|apt-get install -y software-properties-common &&
29+
|add-apt-repository -y ppa:deadsnakes/ppa &&
30+
|apt-get -y update &&
31+
|apt-get install -y python2.7 python3.6 ca-certificates wget openjdk-8-jre-headless &&
2932
|wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python2.7 &&
30-
|wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3.5 &&
33+
|wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3.6 &&
3134
|python2.7 -m pip install django==1.9.2 pylint-django==0.9.0 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
32-
|python3.5 -m pip install django==1.9.2 pylint-django==0.9.0 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
35+
|python3.6 -m pip install django==1.9.2 pylint-django==0.9.0 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
3336
|python2.7 -m pip install pylint-common==0.2.2 &&
34-
|python3.5 -m pip install pylint-common==0.2.2 &&
37+
|python3.6 -m pip install pylint-common==0.2.2 &&
3538
|python2.7 -m pip install pylint-celery==0.3 &&
36-
|python3.5 -m pip install pylint-celery==0.3 &&
39+
|python3.6 -m pip install pylint-celery==0.3 &&
3740
|python2.7 -m pip install SaltPyLint==2017.12.15 &&
38-
|python3.5 -m pip install SaltPyLint==2017.12.15 &&
41+
|python3.6 -m pip install SaltPyLint==2017.12.15 &&
3942
|python2.7 -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
40-
|python3.5 -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
43+
|python3.6 -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
4144
|python2.7 -m pip uninstall -y pip &&
42-
|python3.5 -m pip uninstall -y pip &&
45+
|python3.6 -m pip uninstall -y pip &&
4346
|apt-get clean &&
4447
|rm -rf /var/lib/apt/lists/* &&
4548
|rm -rf /root/.cache/pip &&

src/main/scala/codacy/pylint/Pylint.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ object Pylint extends Tool {
145145
def generateClassification(files: List[String]): String = {
146146
val scriptArgs = files.mkString("###")
147147
val tmp = FileHelper.createTmpFile(classifyScript, "pylint", "")
148-
List("python3.5", tmp.toAbsolutePath.toString, scriptArgs).!!
148+
List("python3.6", tmp.toAbsolutePath.toString, scriptArgs).!!
149149
}
150150

151151
private def classifyFiles(files: List[String]): Try[Map[String, Array[String]]] = {
@@ -192,7 +192,7 @@ object Pylint extends Tool {
192192
def realInterpreterVersion(interpreter: String): String = {
193193
interpreter match {
194194
case "2" => "2.7"
195-
case "3" => "3.5"
195+
case "3" => "3.6"
196196
}
197197
}
198198

0 commit comments

Comments
 (0)