Skip to content

Commit 9098751

Browse files
committed
Merge tag '0.8.0' into develop
no message
2 parents ccb8614 + 66744ff commit 9098751

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
addCommandAlias("makeSite", "docs/makeSite")
2323
addCommandAlias("previewSite", "docs/previewSite")
24+
addCommandAlias("ghpagesPushSite", "docs/ghpagesPushSite")
2425
addCommandAlias("console", "datasource/console")
2526

2627
// Prefer our own IntegrationTest config definition, which inherits from Test.
@@ -36,6 +37,7 @@ lazy val root = project
3637
lazy val `rf-notebook` = project
3738
.dependsOn(pyrasterframes)
3839
.enablePlugins(RFAssemblyPlugin, DockerPlugin)
40+
.settings(publish / skip := true)
3941

4042
lazy val core = project
4143
.enablePlugins(BuildInfoPlugin)

project/RFAssemblyPlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ object RFAssemblyPlugin extends AutoPlugin {
4545
override def projectSettings = Seq(
4646
test in assembly := {},
4747
autoImport.assemblyExcludedJarPatterns := Seq(
48-
"scalatest.*".r
48+
"scalatest.*".r,
49+
"junit.*".r
4950
),
5051
assemblyShadeRules in assembly := {
5152
val shadePrefixes = Seq(

pyrasterframes/src/main/python/pyrasterframes/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
#
2121

2222
# Translating Java version from version.sbt to PEP440 norms
23-
__version__ = '0.8.0.dev0'
23+
__version__ = '0.8.0'

pyrasterframes/src/main/python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def run(self):
104104
if (not self.quick) or (not path.exists(dest)) or (path.getmtime(dest) < path.getmtime(file)):
105105
print(_divided('Running %s' % name))
106106
try:
107-
pweave.weave(file=str(file), doctype=self.format)
107+
pweave.weave(file=str(file), doctype=self.format, cache=True)
108108
if self.format == 'markdown':
109109
if not path.exists(dest):
110110
raise FileNotFoundError("Markdown file '%s' didn't get created as expected" % dest)

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "0.8.0-SNAPSHOT"
1+
version in ThisBuild := "0.8.0"

0 commit comments

Comments
 (0)