Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DF0B8200D02 for ; Sat, 23 Sep 2017 14:04:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DD4DC1609B6; Sat, 23 Sep 2017 12:04:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2F1C41609B5 for ; Sat, 23 Sep 2017 14:04:55 +0200 (CEST) Received: (qmail 40631 invoked by uid 500); 23 Sep 2017 12:04:54 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 40622 invoked by uid 99); 23 Sep 2017 12:04:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Sep 2017 12:04:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4175FF5722; Sat, 23 Sep 2017 12:04:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gurwls223@apache.org To: commits@spark.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-18136] Fix SPARK_JARS_DIR for Python pip install on Windows Date: Sat, 23 Sep 2017 12:04:54 +0000 (UTC) archived-at: Sat, 23 Sep 2017 12:04:56 -0000 Repository: spark Updated Branches: refs/heads/branch-2.2 de6274a58 -> c0a34a9ff [SPARK-18136] Fix SPARK_JARS_DIR for Python pip install on Windows ## What changes were proposed in this pull request? Fix for setup of `SPARK_JARS_DIR` on Windows as it looks for `%SPARK_HOME%\RELEASE` file instead of `%SPARK_HOME%\jars` as it should. RELEASE file is not included in the `pip` build of PySpark. ## How was this patch tested? Local install of PySpark on Anaconda 4.4.0 (Python 3.6.1). Author: Jakub Nowacki Closes #19310 from jsnowacki/master. (cherry picked from commit c11f24a94007bbaad0835645843e776507094071) Signed-off-by: hyukjinkwon Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c0a34a9f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c0a34a9f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c0a34a9f Branch: refs/heads/branch-2.2 Commit: c0a34a9fff0912b3f1ae508e43f1fae53a45afae Parents: de6274a Author: Jakub Nowacki Authored: Sat Sep 23 21:04:10 2017 +0900 Committer: hyukjinkwon Committed: Sat Sep 23 21:04:26 2017 +0900 ---------------------------------------------------------------------- bin/spark-class2.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c0a34a9f/bin/spark-class2.cmd ---------------------------------------------------------------------- diff --git a/bin/spark-class2.cmd b/bin/spark-class2.cmd index f6157f4..a93fd2f 100644 --- a/bin/spark-class2.cmd +++ b/bin/spark-class2.cmd @@ -29,7 +29,7 @@ if "x%1"=="x" ( ) rem Find Spark jars. -if exist "%SPARK_HOME%\RELEASE" ( +if exist "%SPARK_HOME%\jars" ( set SPARK_JARS_DIR="%SPARK_HOME%\jars" ) else ( set SPARK_JARS_DIR="%SPARK_HOME%\assembly\target\scala-%SPARK_SCALA_VERSION%\jars" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org