You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2015/04/19 01:47:58 UTC
spark git commit: [SPARK-6219] Reuse pep8.py
Repository: spark
Updated Branches:
refs/heads/master 327ebf0cb -> 28683b4df
[SPARK-6219] Reuse pep8.py
Per the discussion in the comments on [this commit](https://github.com/apache/spark/commit/f17d43b033d928dbc46aef8e367aa08902e698ad#commitcomment-10780649), this PR allows the Python lint script to reuse `pep8.py` when possible.
Author: Nicholas Chammas <ni...@gmail.com>
Closes #5561 from nchammas/save-dem-pep8-bytes and squashes the following commits:
b7c91e6 [Nicholas Chammas] reuse pep8.py
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/28683b4d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/28683b4d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/28683b4d
Branch: refs/heads/master
Commit: 28683b4df5de06373b867068b9b8adfbcaf93176
Parents: 327ebf0
Author: Nicholas Chammas <ni...@gmail.com>
Authored: Sat Apr 18 16:46:28 2015 -0700
Committer: Josh Rosen <jo...@databricks.com>
Committed: Sat Apr 18 16:46:28 2015 -0700
----------------------------------------------------------------------
dev/.gitignore | 1 +
dev/lint-python | 21 +++++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/28683b4d/dev/.gitignore
----------------------------------------------------------------------
diff --git a/dev/.gitignore b/dev/.gitignore
new file mode 100644
index 0000000..4a60274
--- /dev/null
+++ b/dev/.gitignore
@@ -0,0 +1 @@
+pep8*.py
http://git-wip-us.apache.org/repos/asf/spark/blob/28683b4d/dev/lint-python
----------------------------------------------------------------------
diff --git a/dev/lint-python b/dev/lint-python
index fded654..f50d149 100755
--- a/dev/lint-python
+++ b/dev/lint-python
@@ -32,18 +32,19 @@ compile_status="${PIPESTATUS[0]}"
#+ See: https://github.com/apache/spark/pull/1744#issuecomment-50982162
#+ TODOs:
#+ - Download pep8 from PyPI. It's more "official".
-PEP8_SCRIPT_PATH="$SPARK_ROOT_DIR/dev/pep8.py"
-PEP8_SCRIPT_REMOTE_PATH="https://raw.githubusercontent.com/jcrocholl/pep8/1.6.2/pep8.py"
+PEP8_VERSION="1.6.2"
+PEP8_SCRIPT_PATH="$SPARK_ROOT_DIR/dev/pep8-$PEP8_VERSION.py"
+PEP8_SCRIPT_REMOTE_PATH="https://raw.githubusercontent.com/jcrocholl/pep8/$PEP8_VERSION/pep8.py"
-# if [ ! -e "$PEP8_SCRIPT_PATH" ]; then
-curl --silent -o "$PEP8_SCRIPT_PATH" "$PEP8_SCRIPT_REMOTE_PATH"
-curl_status="$?"
+if [ ! -e "$PEP8_SCRIPT_PATH" ]; then
+ curl --silent -o "$PEP8_SCRIPT_PATH" "$PEP8_SCRIPT_REMOTE_PATH"
+ curl_status="$?"
-if [ "$curl_status" -ne 0 ]; then
- echo "Failed to download pep8.py from \"$PEP8_SCRIPT_REMOTE_PATH\"."
- exit "$curl_status"
+ if [ "$curl_status" -ne 0 ]; then
+ echo "Failed to download pep8.py from \"$PEP8_SCRIPT_REMOTE_PATH\"."
+ exit "$curl_status"
+ fi
fi
-# fi
# There is no need to write this output to a file
#+ first, but we do so so that the check status can
@@ -65,7 +66,7 @@ else
echo "Python lint checks passed."
fi
-rm "$PEP8_SCRIPT_PATH"
+# rm "$PEP8_SCRIPT_PATH"
rm "$PYTHON_LINT_REPORT_PATH"
exit "$lint_status"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org