Fix more deprecation warnings

jeremyrsmith · jeremyrsmith · commit 6a2189863ced · 2019-10-23T08:20:56.000-07:00
diff --git a/polynote-kernel/src/main/scala/polynote/kernel/interpreter/python/PythonInterpreter.scala b/polynote-kernel/src/main/scala/polynote/kernel/interpreter/python/PythonInterpreter.scala
@@ -476,7 +476,6 @@ object PythonInterpreter {
     classLoader => ZIO {
       val conf = new JepConfig()
         .addSharedModules(sharedModules: _*)
-        .setInteractive(false)
         .setClassLoader(classLoader)
         .setClassEnquirer(new NamingConventionClassEnquirer(true).addTopLevelPackageName("polynote"))
       val interp = new SubInterpreter(conf)
diff --git a/polynote-kernel/src/test/scala/polynote/data/RopeSpec.scala b/polynote-kernel/src/test/scala/polynote/data/RopeSpec.scala
@@ -2,9 +2,9 @@ package polynote.data
 
 import org.scalacheck.Gen
 import org.scalatest._
-import org.scalatest.prop.PropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
-class RopeSpec extends FlatSpec with Matchers with PropertyChecks {
+class RopeSpec extends FlatSpec with Matchers with ScalaCheckPropertyChecks {
 
   val r = new scala.util.Random(System.nanoTime())
   val aLongString: String = r.nextString(Rope.thresh * 10)
diff --git a/polynote-kernel/src/test/scala/polynote/kernel/remote/RemoteKernelSpec.scala b/polynote-kernel/src/test/scala/polynote/kernel/remote/RemoteKernelSpec.scala
@@ -4,8 +4,8 @@ package remote
 import java.util.concurrent.TimeUnit
 
 import org.scalamock.scalatest.MockFactory
-import org.scalatest.prop.GeneratorDrivenPropertyChecks
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, FreeSpec, Matchers}
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import polynote.kernel.Kernel.Factory
 import polynote.kernel.environment.{NotebookUpdates, PublishResult, PublishStatus}
 import polynote.kernel.{BaseEnv, CellEnv, Completion, CompletionType, GlobalEnv, Kernel, KernelBusyState, KernelInfo, Output, ParameterHint, ParameterHints, ResultValue, Signatures, TaskInfo, UpdatedTasks}
@@ -17,12 +17,12 @@ import polynote.testing.{Generators, ZIOSpec}
 import polynote.testing.kernel.{MockEnv, MockKernelEnv}
 import polynote.testing.kernel.remote.InProcessDeploy
 import scodec.bits.ByteVector
-import zio.{Ref, Task, RIO, ZIO}
+import zio.{RIO, Ref, Task, ZIO}
 import zio.interop.catz._
 
 import scala.concurrent.TimeoutException
 
-class RemoteKernelSpec extends FreeSpec with Matchers with ZIOSpec with BeforeAndAfterAll with BeforeAndAfterEach with MockFactory with GeneratorDrivenPropertyChecks {
+class RemoteKernelSpec extends FreeSpec with Matchers with ZIOSpec with BeforeAndAfterAll with BeforeAndAfterEach with MockFactory with ScalaCheckDrivenPropertyChecks {
   private val kernel        = mock[Kernel]
   private val kernelFactory = new Factory.LocalService {
     def apply(): RIO[BaseEnv with GlobalEnv with CellEnv, Kernel] = ZIO.succeed(kernel)
diff --git a/polynote-kernel/src/test/scala/polynote/messages/ContentEditSpec.scala b/polynote-kernel/src/test/scala/polynote/messages/ContentEditSpec.scala
@@ -1,12 +1,12 @@
 package polynote.messages
 
 import org.scalacheck.{Arbitrary, Shrink}
-import org.scalatest.prop.GeneratorDrivenPropertyChecks
 import org.scalatest.{FreeSpec, Matchers}
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import polynote.data.Rope
 import polynote.testing.Generators
 
-class ContentEditSpec extends FreeSpec with Matchers with GeneratorDrivenPropertyChecks {
+class ContentEditSpec extends FreeSpec with Matchers with ScalaCheckDrivenPropertyChecks {
 
   case class EditScenario(initial: Rope, edit: ContentEdit, edits: ContentEdits)
 
diff --git a/polynote-runtime/src/test/scala/polynote/runtime/test/DataReprsTest.scala b/polynote-runtime/src/test/scala/polynote/runtime/test/DataReprsTest.scala
@@ -1,17 +1,18 @@
 package polynote.runtime
 package test
 
-import org.scalacheck.{Arbitrary, Gen}, Arbitrary.arbitrary
-import org.scalatest.prop.GeneratorDrivenPropertyChecks
+import org.scalacheck.{Arbitrary, Gen}
+import Arbitrary.arbitrary
 import org.scalatest.{FreeSpec, Matchers}
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import scala.reflect.runtime.universe.TypeTag
 
 /**
   * Exercises some DataReprs to make sure they don't crash. Doesn't do any validations, though, because we don't have
   * the decoding side in Scala land. TODO: an integration test with the JS code to make sure they get decoded correctly too
   */
-class DataReprsTest extends FreeSpec with Matchers with GeneratorDrivenPropertyChecks {
+class DataReprsTest extends FreeSpec with Matchers with ScalaCheckDrivenPropertyChecks {
 
   implicit val arbString: Arbitrary[String] = Arbitrary(Gen.listOf(arbitrary[Char]).map(_.mkString))
 
