Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Drop Scala 2.11, update circe#1448

Merged
jeremyrsmith merged 9 commits intomasterpolynote/polynote:masterfrom
update-circepolynote/polynote:update-circeCopy head branch name to clipboard
Oct 23, 2024
Merged

Drop Scala 2.11, update circe#1448
jeremyrsmith merged 9 commits intomasterpolynote/polynote:masterfrom
update-circepolynote/polynote:update-circeCopy head branch name to clipboard

Conversation

@jeremyrsmith
Copy link
Contributor

@jeremyrsmith jeremyrsmith commented Jul 31, 2024

  • Drops Scala 2.11 and moves the default version to be 2.12
  • Updates circe to 0.14.3


val distBuildDir = file(".") / "target" / "dist" / "polynote"
val scalaVersions = Seq("2.11.12", "2.12.15", "2.13.6")
val scalaVersions = Seq("2.12.15", "2.13.6")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason not to bump to the latest 2.12.x and 2.13.x while we're here?

val sparkVersions = Map(
"2.11" -> "2.1.1",
"2.12" -> "3.1.2",
"2.13" -> "3.2.1"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably for a separate PR, but we should probably update the Spark versions too

|---------------------------------|-------------------------------------------------------|
| Base image with Scala 2.12 | `polynote/polynote:${POLYNOTE_VERSION}-2.12` |
| Base image with Scala 2.13 | `polynote/polynote:${POLYNOTE_VERSION}-2.12` |
| Spark 2.4 image with Scala 2.12 | `polynote/polynote:${POLYNOTE_VERSION}-2.12-spark2.4` |
Copy link
Collaborator

@jonathanindig jonathanindig Aug 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we drop Spark 2.4 from this list?

@jonathanindig
Copy link
Collaborator

I think we need to update dist.yml:

export SCALA_VERSION="2.11"

We can also remove some other 2.11 logic e.g., in

if test "${SPARK_VERSION}" \> "3" -a "${SCALA_VERSION}" = "2.11"
(and probably the 2.4 support too?)

implicit val circeConfig: Configuration =
Configuration.default.withSnakeCaseConstructorNames.withSnakeCaseMemberNames.withDefaults

abstract class ValidatedConfigDecoder[A] extends ConfiguredDecoder[A](circeConfig.copy(useDefaults = false))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

docker build --build-arg POLYNOTE_VERSION --build-arg SCALA_VERSION -t polynote/polynote:${POLYNOTE_VERSION}-${SCALA_VERSION}-spark2.4 docker/spark
docker push polynote/polynote:${POLYNOTE_VERSION}-${SCALA_VERSION}-spark2.4
docker tag polynote/polynote:${POLYNOTE_VERSION}-${SCALA_VERSION}-spark2.4 polynote/polynote:latest
docker push polynote/polynote:latest
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeremyrsmith Updated dist.yml like we discussed. I think this is the only change necessary? I guess we will find out one way or another once this is merged...

@jeremyrsmith jeremyrsmith merged commit 4c13bff into master Oct 23, 2024
@jeremyrsmith jeremyrsmith deleted the update-circe branch October 23, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.