Skip to content

Commit 07f8881

Browse files
author
Bruno Ferreira
committed
feature: bump seed, scala and play-json FT-7452 :breaking:
1 parent f7533fb commit 07f8881

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ name := """codacy-engine-pylint"""
44

55
version := "1.0-SNAPSHOT"
66

7-
val languageVersion = "2.11.12"
7+
val languageVersion = "2.12.7"
88

99
scalaVersion := languageVersion
1010

1111
resolvers := Seq("Sonatype OSS Snapshots".at("https://oss.sonatype.org/content/repositories/releases")) ++ resolvers.value
1212

1313
libraryDependencies ++= Seq(
14-
"com.typesafe.play" %% "play-json" % "2.4.8",
15-
"com.codacy" %% "codacy-engine-scala-seed" % "2.7.8"
14+
"com.typesafe.play" %% "play-json" % "2.7.3",
15+
"com.codacy" %% "codacy-engine-scala-seed" % "3.0.9"
1616
)
1717

1818
enablePlugins(JavaAppPackaging)
@@ -30,7 +30,7 @@ val installAll =
3030
|apt-get -y update &&
3131
|apt-get install -y python2.7 python3.6 ca-certificates wget openjdk-8-jre-headless &&
3232
|wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python2.7 &&
33-
|wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3.6 &&
33+
|wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3.6 &&
3434
|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 &&
3535
|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 &&
3636
|python2.7 -m pip install pylint-common==0.2.2 &&

src/main/scala/codacy/Engine.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package codacy
22

3-
import codacy.dockerApi.DockerEngine
43
import codacy.pylint.Pylint
4+
import com.codacy.tools.scala.seed.DockerEngine
55

6-
object Engine extends DockerEngine(Pylint)
6+
object Engine extends DockerEngine(Pylint)()

src/main/scala/codacy/pylint/ParameterHeader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package codacy.pylint
22

3-
import codacy.docker.api.Parameter
3+
import com.codacy.plugins.api.results.Parameter
44

55
private[pylint] object ParameterHeader {
66

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ package codacy.pylint
33
import java.io.File
44
import java.nio.file.{Files, Path}
55

6-
import codacy.docker.api._
7-
import codacy.docker.api.utils.ToolHelper
8-
import codacy.dockerApi.utils.{CommandRunner, FileHelper}
6+
import com.codacy.plugins.api.{ErrorMessage, Options, Source}
7+
import com.codacy.plugins.api.results.{Parameter, Pattern, Result, Tool}
8+
import com.codacy.tools.scala.seed.utils.ToolHelper._
9+
import com.codacy.tools.scala.seed.utils.{CommandRunner, FileHelper}
910
import play.api.libs.json._
1011

1112
import scala.sys.process._
1213
import scala.util.{Properties, Success, Try}
1314

1415
object Pylint extends Tool {
1516

16-
private val pythonVersionKey = Configuration.Key("python_version")
17+
private val pythonVersionKey = Options.Key("python_version")
1718
private val python3 = "3"
1819

1920
def apply(source: Source.Directory, configuration: Option[List[Pattern.Definition]], files: Option[Set[Source.File]],
20-
options: Map[Configuration.Key, Configuration.Value])
21+
options: Map[Options.Key, Options.Value])
2122
(implicit specification: Tool.Specification): Try[List[Result]] = {
22-
val completeConf = ToolHelper.patternsToLint(configuration)
23+
val completeConf = configuration.withDefaultParameters
2324

2425
def isEnabled(issue: Result) = {
2526
issue match {
@@ -65,7 +66,7 @@ object Pylint extends Tool {
6566
linesTry.map { line => line.flatMap(parseLine).flatten.filter(isEnabled) }
6667
}
6768

68-
private def parseLine(line: String) = {
69+
private def parseLine(line: String): Option[List[Result]] = {
6970
val LineRegex = """(.*?)###(\d*?)###(.*?)###(.*?)""".r
7071

7172
def createIssue(filename: String, lineNumber: String, message: String, patternId: String) = {

0 commit comments

Comments
 (0)