Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI fix. #582

Merged
merged 3 commits into from
Jun 14, 2022
Merged

CI fix. #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fe79a1
CI fix.
metasim Apr 7, 2022
201aba5
Dependency updates.
metasim Apr 7, 2022
8d2bff4
Spark 3.1.3
metasim May 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

// Leave me an my custom keys alone!
// Leave me and my custom keys alone!
Global / lintUnusedKeysOnLoad := false

addCommandAlias("makeSite", "docs/makeSite")
Expand Down
18 changes: 9 additions & 9 deletions project/RFDependenciesPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ object RFDependenciesPlugin extends AutoPlugin {
}
}
val scalatest = "org.scalatest" %% "scalatest" % "3.2.5" % Test
val shapeless = "com.chuusai" %% "shapeless" % "2.3.7"
val `jts-core` = "org.locationtech.jts" % "jts-core" % "1.17.0"
val `slf4j-api` = "org.slf4j" % "slf4j-api" % "1.7.28"
val scaffeine = "com.github.blemale" %% "scaffeine" % "4.0.2"
val `spray-json` = "io.spray" %% "spray-json" % "1.3.4"
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.8.0"
val shapeless = "com.chuusai" %% "shapeless" % "2.3.9"
val `jts-core` = "org.locationtech.jts" % "jts-core" % "1.18.2"
val `slf4j-api` = "org.slf4j" % "slf4j-api" % "1.7.36"
val scaffeine = "com.github.blemale" %% "scaffeine" % "5.1.2"
val `spray-json` = "io.spray" %% "spray-json" % "1.3.6"
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4"
val stac4s = "com.azavea.stac4s" %% "client" % "0.7.2"
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.3.15"
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.5.1"
val frameless = "org.typelevel" %% "frameless-dataset-spark31" % "0.11.1"
val framelessRefined = "org.typelevel" %% "frameless-refined-spark31" % "0.11.1"
val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1" % Test
val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1"
}
import autoImport._

Expand All @@ -70,7 +70,7 @@ object RFDependenciesPlugin extends AutoPlugin {
"jitpack" at "https://jitpack.io"
),
// NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
rfSparkVersion := "3.1.2",
rfSparkVersion := "3.1.3",
rfGeoTrellisVersion := "3.6.1",
rfGeoMesaVersion := "3.2.0",
excludeDependencies += "log4j" % "log4j"
Expand Down
2 changes: 1 addition & 1 deletion pyrasterframes/src/main/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def dest_file(self, src_file):
# to throw a `NotImplementedError: Can't perform this operation for unregistered loader type`
pytest = 'pytest>=4.0.0,<5.0.0'

pyspark = 'pyspark==3.1.2'
pyspark = 'pyspark==3.1.3'
boto3 = 'boto3'
deprecation = 'deprecation'
descartes = 'descartes'
Expand Down