From 972640d96b6019cba9ba756946122aef3f8c5dea Mon Sep 17 00:00:00 2001 From: Sid Murching Date: Fri, 25 Aug 2017 15:58:48 -0700 Subject: [PATCH 1/3] Update version number to 0.2.9-rc1, update pandas version from 0.19.0 -> 0.19.1 --- README.md | 10 +++++----- project/Build.scala | 2 +- python/requirements.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 03db358..907fa0b 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Additionally, if you want to run unit tests for python, you need the following d Assuming that `SPARK_HOME` is set, you can use PySpark like any other Spark package. ```bash -$SPARK_HOME/bin/pyspark --packages databricks:tensorframes:0.2.9-rc0-s_2.11 +$SPARK_HOME/bin/pyspark --packages databricks:tensorframes:0.2.9-rc1-s_2.11 ``` Here is a small program that uses Tensorflow to add 3 to an existing column. @@ -150,7 +150,7 @@ The scala support is a bit more limited than python. In scala, operations can be You simply use the published package: ```bash -$SPARK_HOME/bin/spark-shell --packages databricks:tensorframes:0.2.9-rc0 +$SPARK_HOME/bin/spark-shell --packages databricks:tensorframes:0.2.9-rc1 ``` Here is the same program as before: @@ -200,14 +200,14 @@ build/sbt distribution/spDist Assuming that SPARK_HOME is set and that you are in the root directory of the project: ```bash -$SPARK_HOME/bin/spark-shell --jars $PWD/target/testing/scala-2.11/tensorframes-assembly-0.2.9-rc0.jar +$SPARK_HOME/bin/spark-shell --jars $PWD/target/testing/scala-2.11/tensorframes-assembly-0.2.9-rc1.jar ``` If you want to run the python version: ```bash -PYTHONPATH=$PWD/target/testing/scala-2.11/tensorframes-assembly-0.2.9-rc0.jar \ -$SPARK_HOME/bin/pyspark --jars $PWD/target/testing/scala-2.11/tensorframes-assembly-0.2.9-rc0.jar +PYTHONPATH=$PWD/target/testing/scala-2.11/tensorframes-assembly-0.2.9-rc1.jar \ +$SPARK_HOME/bin/pyspark --jars $PWD/target/testing/scala-2.11/tensorframes-assembly-0.2.9-rc1.jar ``` ## Acknowledgements diff --git a/project/Build.scala b/project/Build.scala index a2ed318..daefcfb 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -11,7 +11,7 @@ object Shading extends Build { lazy val commonSettings = Seq( - version := "0.2.9-rc0", + version := "0.2.9-rc1", name := "tensorframes", scalaVersion := sys.props.getOrElse("scala.version", "2.11.8"), organization := "databricks", diff --git a/python/requirements.txt b/python/requirements.txt index 1d15f1e..97dee9f 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,3 +1,3 @@ # This file should list any python package dependencies. nose==1.3.3 -pandas==0.19.0 +pandas==0.19.1 From 2bbb29feced0d3f0a7eae647cc663f631a7b0e33 Mon Sep 17 00:00:00 2001 From: Sid Murching Date: Mon, 28 Aug 2017 13:40:41 -0700 Subject: [PATCH 2/3] Update readme to indicate that pandas is now a tensorframes dependency --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 907fa0b..41f8f28 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,8 @@ TensorFrames is available as a [official instructions](https://www.tensorflow.org/versions/r0.7/get_started/os_setup.html#download-and-setup) on how to get the latest release of TensorFlow. + - (Optional) pandas >= 0.19.1 if you want to use the python interface + - (Optional) the [Nix package manager](http://nixos.org/nix/) if you want to guarantee a fully reproducible build environment. This is the environment that will be used for reproducing bugs. Additionally, if you want to run unit tests for python, you need the following dependencies: From b02c41252e775914898a6d2b2c86bfb76a4eb943 Mon Sep 17 00:00:00 2001 From: Sid Murching Date: Mon, 28 Aug 2017 14:32:01 -0700 Subject: [PATCH 3/3] Update python dependencies to specify minimum version requirements instead of absolute version requirements --- python/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/requirements.txt b/python/requirements.txt index 97dee9f..d23e599 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,3 +1,3 @@ # This file should list any python package dependencies. -nose==1.3.3 -pandas==0.19.1 +nose>=1.3.3 +pandas>=0.19.1