diff --git a/.gitignore b/.gitignore index dacb8dba4..b74bd29f3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ lib_managed/ src_managed/ project/boot/ project/plugins/project/ +project/project # intellij .idea/ diff --git a/build.sbt b/build.sbt index 8bb8d106c..d77cbf86e 100644 --- a/build.sbt +++ b/build.sbt @@ -20,11 +20,11 @@ sparkVersion := sparkVer scalaVersion := scalaVer name := "graphframes" - +organization := "graphframes" spName := "graphframes/graphframes" // Don't forget to set the version -version := s"0.6.0-SNAPSHOT-spark$sparkBranch" +version := s"0.5.10-spark$sparkBranch" // All Spark Packages need a license licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0")) @@ -78,3 +78,36 @@ concurrentRestrictions in Global := Seq( autoAPIMappings := true coverageHighlighting := false + +val metisArtifactRepoBaseURL = "s3://s3-us-east-1.amazonaws.com/metis-artifacts/" +// set up publishing to our private repo on S3 +def myPublishTo = Command.command("mpublish") { state => + val extracted = Project.extract(state) + Project.runTask( + publish in Compile, + extracted.append(List(publishTo := Some(Resolver.file("file", new File(System.getProperty("user.home") + + "/.m2/repository")))), state), + true + ) + Project.runTask( + publish in Compile, + extracted.append(List(publishTo := { + if (isSnapshot.value) + Some("snapshots" at metisArtifactRepoBaseURL + "snapshots") + else + Some("releases" at metisArtifactRepoBaseURL + "releases") + }), state), + true + ) + state +} + +commands += myPublishTo + +publishTo := { + if (isSnapshot.value) + Some("snapshots" at metisArtifactRepoBaseURL + "snapshots") + else + Some("releases" at metisArtifactRepoBaseURL + "releases") +} + diff --git a/project/build.properties b/project/build.properties index ebcf48fea..49829924c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ // This file should only contain the version of sbt to use. -sbt.version=0.13.6 +sbt.version=0.13.13 diff --git a/project/plugins.sbt b/project/plugins.sbt index c4170fb39..a97c65f6c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,9 @@ // You may use this file to add plugin dependencies for sbt. resolvers += "Spark Packages repo" at "https://dl.bintray.com/spark-packages/maven/" - +addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.13.0") addSbtPlugin("org.spark-packages" %% "sbt-spark-package" % "0.2.6") // scalacOptions in (Compile,doc) := Seq("-groups", "-implicits") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") + diff --git a/python/.gitignore b/python/.gitignore index 81410ca55..f6d838fc4 100644 --- a/python/.gitignore +++ b/python/.gitignore @@ -2,3 +2,4 @@ docs/_build/ build/ dist/ +graphframes.egg-info diff --git a/python/README.md b/python/README.md new file mode 100644 index 000000000..6fcc66d82 --- /dev/null +++ b/python/README.md @@ -0,0 +1,3 @@ +# Graphframes +This is a dummy readme file. +The upstream graphframes package does not include install info for the python side of things, so this code accomplishes just that. diff --git a/python/setup.py b/python/setup.py index 9dad5462e..f89348adf 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,2 +1,9 @@ -# Your python setup file. An example can be found at: -# https://github.com/pypa/sampleproject/blob/master/setup.py +from setuptools import setup + +setup(name='graphframes', + maintainer='Metismachine', + maintainer_email='info@metismachine.com', + url='http://metismachine.com', + version='0.5.9', + packages=['graphframes', 'graphframes.lib'] +)