Merge pull request #37 from codacy/fix-build

Fix build

Author: rtfpessoa

.circleci/config.yml

@@ -37,11 +37,11 @@ jobs:
       - run: 
           name: Test json
           working_directory: ~/codacy-plugins-test
-          command: sbt -Dcodacy.tests.ignore.descriptions=true "run-main codacy.plugins.DockerTest json $CIRCLE_PROJECT_REPONAME:latest"
+          command: sbt -Dcodacy.tests.ignore.descriptions=true "runMain codacy.plugins.DockerTest json $CIRCLE_PROJECT_REPONAME:latest"
       - run:
           name: Test patterns
           working_directory: ~/codacy-plugins-test
-          command: sbt -Dcodacy.tests.noremove=true -Dcodacy.tests.threads=8 "run-main codacy.plugins.DockerTest pattern $CIRCLE_PROJECT_REPONAME:latest"
+          command: sbt -Dcodacy.tests.noremove=true -Dcodacy.tests.threads=8 "runMain codacy.plugins.DockerTest pattern $CIRCLE_PROJECT_REPONAME:latest"
       - deploy:
           name: Push application Docker image
           command: |

build.sbt

@@ -4,17 +4,14 @@ name := """codacy-engine-pylint"""
 
 version := "1.0-SNAPSHOT"
 
-val languageVersion = "2.11.7"
+val languageVersion = "2.11.12"
 
 scalaVersion := languageVersion
 
-resolvers ++= Seq(
-  "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/",
-  "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/releases"
-)
+resolvers := Seq("Sonatype OSS Snapshots".at("https://oss.sonatype.org/content/repositories/releases")) ++ resolvers.value
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play-json" % "2.3.8",
+  "com.typesafe.play" %% "play-json" % "2.4.8",
   "com.codacy" %% "codacy-engine-scala-seed" % "2.7.8"
 )
 
@@ -27,27 +24,30 @@ version in Docker := "1.0"
 organization := "com.codacy"
 
 val installAll =
-  s"""echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories &&
-     |apk --no-cache add bash wget ca-certificates git &&
-     |apk --no-cache add python &&
-     |apk --no-cache add 'python3>3.6.1' &&
-     |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python &&
-     |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3 &&
-     |python -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 &&
-     |python3 -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 &&
-     |python -m pip install pylint-common==0.2.2 &&
-     |python3 -m pip install pylint-common==0.2.2 &&
-     |python -m pip install pylint-celery==0.3 &&
-     |python3 -m pip install pylint-celery==0.3 &&
-     |python -m pip install SaltPyLint==2017.12.15 &&
-     |python3 -m pip install SaltPyLint==2017.12.15 &&
-     |python -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
-     |python3 -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
-     |python -m pip uninstall -y pip &&
-     |python3 -m pip uninstall -y pip &&
-     |apk del wget ca-certificates git &&
-     |rm -rf /tmp/* &&
-     |rm -rf /var/cache/apk/*""".stripMargin.replaceAll(System.lineSeparator()," ")
+  s"""apt-get update &&
+      |apt-get -y install python2.7 python3.5 ca-certificates wget openjdk-8-jre-headless &&
+      |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python2.7 &&
+      |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3.5 && 
+      |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 &&
+      |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 &&
+      |python2.7 -m  pip install pylint-common==0.2.2 &&
+      |python3.5 -m pip install pylint-common==0.2.2 &&
+      |python2.7 -m  pip install pylint-celery==0.3 &&
+      |python3.5 -m pip install pylint-celery==0.3 &&
+      |python2.7 -m  pip install SaltPyLint==2017.12.15 &&
+      |python3.5 -m pip install SaltPyLint==2017.12.15 &&
+      |python2.7 -m  pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
+      |python3.5 -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
+      |python2.7 -m  pip uninstall -y pip &&
+      |python3.5 -m pip uninstall -y pip &&
+      |apt-get clean &&
+      |rm -rf /var/lib/apt/lists/* &&
+      |rm -rf /root/.cache/pip &&
+      |rm -rf /root/.pip/cache &&
+      |rm -rf /var/lib/apt/lists/* &&
+      |rm -rf /var/cache/apt &&
+      |rm -rf /var/cache/oracle-jdk8-installer &&
+      |rm -rf /tmp/*""".stripMargin.replaceAll(System.lineSeparator(), " ")
 
 mappings in Universal <++= (resourceDirectory in Compile) map { (resourceDir: File) =>
   val src = resourceDir / "docs"
@@ -66,15 +66,15 @@ daemonUser in Docker := dockerUser
 
 daemonGroup in Docker := dockerGroup
 
-dockerBaseImage := "develar/java"
+dockerBaseImage := "ubuntu:16.04"
 
 dockerCommands := dockerCommands.value.flatMap {
   case cmd@Cmd("WORKDIR", _) => List(cmd,
     Cmd("RUN", installAll)
   )
   case cmd@(Cmd("ADD", "opt /opt")) => List(cmd,
     Cmd("RUN", "mv /opt/docker/docs /docs"),
-    Cmd("RUN", s"adduser -u 2004 -D $dockerUser"),
+    Cmd("RUN", "adduser --uid 2004 --disabled-password --gecos \"\" docker"),
     ExecCmd("RUN", Seq("chown", "-R", s"$dockerUser:$dockerGroup", "/docs"): _*)
   )
   case other => List(other)

project/build.properties

@@ -1,4 +1 @@
-#Activator-generated Properties
-#Tue Jun 23 14:00:32 EEST 2015
-template.uuid=7faf8e1e-4e8d-4387-8159-642b50383096
-sbt.version=0.13.8
+sbt.version=0.13.17

src/main/resources/docs/tests/E1127.py

@@ -4,12 +4,10 @@
 
 
 def function1():
-    ##Err: E1127
     ##Err: E1127
     return TESTLIST[id:id:]
 
 def function2():
-    ##Err: E1127
     ##Err: E1127
     return TESTLIST['0':'1':]
 

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

@@ -145,7 +145,7 @@ object Pylint extends Tool {
   def generateClassification(files: List[String]): String = {
     val scriptArgs = files.mkString("###")
     val tmp = FileHelper.createTmpFile(classifyScript, "pylint", "")
-    List("python3", tmp.toAbsolutePath.toString, scriptArgs).!!
+    List("python3.5", tmp.toAbsolutePath.toString, scriptArgs).!!
   }
 
   private def classifyFiles(files: List[String]): Try[Map[String, Array[String]]] = {
@@ -183,12 +183,19 @@ object Pylint extends Tool {
     val additionalPlugins = django ++ flask
 
     configPart.map { configPart =>
-      List("python" + interpreter, "-m", "pylint") ++
+      List("python" + realInterpreterVersion(interpreter), "-m", "pylint") ++
         configPart ++ List(s"--msg-template=$msgTemplate", "--output-format=parseable") ++
         rulesPart ++ additionalPlugins ++ files
     }
   }
 
+  def realInterpreterVersion(interpreter: String): String = {
+    interpreter match {
+      case "2" => "2.7"
+      case "3" => "3.5"
+    }
+  }
+
   private def writeConfigFile(configuration: List[Pattern.Definition]): Try[Path] = {
 
     val parameters = configuration.flatMap { pattern =>