Skip to content

Commit fdf1cba

Browse files
committed
Move tox.ini to dev (and update pep8 while we're at it); fix newline at end of .rat-excludes; make target dir for RAT first
1 parent 4e5ec1e commit fdf1cba

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

dev/.rat-excludes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ org.apache.spark.scheduler.SparkHistoryListenerFactory
9797
LZ4BlockInputStream.java
9898
spark-deps-.*
9999
.*csv
100-
.*tsv
100+
.*tsv

dev/check-license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ mkdir -p "$FWDIR"/lib
6767
exit 1
6868
}
6969

70+
mkdir target
7071
$java_cmd -jar "$rat_jar" -E "$FWDIR"/dev/.rat-excludes -d "$FWDIR" > target/rat-results.txt
7172

7273
if [ $? -ne 0 ]; then

dev/lint-python

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ compile_status="${PIPESTATUS[0]}"
3737
#+ See: https://github.com/apache/spark/pull/1744#issuecomment-50982162
3838
#+ TODOs:
3939
#+ - Download pep8 from PyPI. It's more "official".
40-
PEP8_VERSION="1.6.2"
40+
PEP8_VERSION="1.7.0"
4141
PEP8_SCRIPT_PATH="$SPARK_ROOT_DIR/dev/pep8-$PEP8_VERSION.py"
4242
PEP8_SCRIPT_REMOTE_PATH="https://raw.githubusercontent.com/jcrocholl/pep8/$PEP8_VERSION/pep8.py"
4343

@@ -80,7 +80,7 @@ export "PATH=$PYTHONPATH:$PATH"
8080
#+ first, but we do so so that the check status can
8181
#+ be output before the report, like with the
8282
#+ scalastyle and RAT checks.
83-
python "$PEP8_SCRIPT_PATH" --ignore=E402,E731,E241,W503,E226 $PATHS_TO_CHECK >> "$PEP8_REPORT_PATH"
83+
python "$PEP8_SCRIPT_PATH" --ignore=E402,E731,E241,W503,E226 --config=dev/tox.ini $PATHS_TO_CHECK >> "$PEP8_REPORT_PATH"
8484
pep8_status="${PIPESTATUS[0]}"
8585

8686
if [ "$compile_status" -eq 0 -a "$pep8_status" -eq 0 ]; then
File renamed without changes.

0 commit comments

Comments
 (0)