ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-30674][INFRA] Use python3 in dev/lint-python

Browse source 
### What changes were proposed in this pull request?

This PR aims to use `python3` instead of `python` in `dev/lint-python`.

### Why are the changes needed?

Currently, `dev/lint-python` fails at Python 2. And, Python 2 is EOL since January 1st 2020.
```
$ python -V
Python 2.7.17

$ dev/lint-python
starting python compilation test...
Python compilation failed with the following errors:
Compiling ./python/setup.py ...
  File "./python/setup.py", line 27
    file=sys.stderr)
        ^
SyntaxError: invalid syntax
```

### Does this PR introduce any user-facing change?

No. This is a dev environment.

### How was this patch tested?

Jenkins is running this with Python 3 already.
The following is a manual test.

```
$ python -V
Python 3.8.0

$ dev/lint-python
starting python compilation test...
python compilation succeeded.
```

Closes #27394 from dongjoon-hyun/SPARK-30674.

Authored-by: Dongjoon Hyun <dhyun@apple.com>
Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
This commit is contained in:
Dongjoon Hyun 2020-01-30 03:17:29 -08:00
parent bda0669110
commit 561e9b9688
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dev/lint-python
View file

@ -36,9 +36,9 @@ function compile_python_test {
exit 1; exit 1;
fi fi
# compileall: https://docs.python.org/2/library/compileall.html # compileall: https://docs.python.org/3/library/compileall.html
echo "starting python compilation test..." echo "starting python compilation test..."
COMPILE_REPORT=$( (python -B -mcompileall -q -l -x "[/\\\\][.]git" $1) 2>&1) COMPILE_REPORT=$( (python3 -B -mcompileall -q -l -x "[/\\\\][.]git" $1) 2>&1)
COMPILE_STATUS=$? COMPILE_STATUS=$?
if [ $COMPILE_STATUS -ne 0 ]; then if [ $COMPILE_STATUS -ne 0 ]; then
@ -70,7 +70,7 @@ function pycodestyle_test {
RUN_LOCAL_PYCODESTYLE="False" RUN_LOCAL_PYCODESTYLE="False"
if hash "$PYCODESTYLE_BUILD" 2> /dev/null; then if hash "$PYCODESTYLE_BUILD" 2> /dev/null; then
VERSION=$( $PYCODESTYLE_BUILD --version 2> /dev/null) VERSION=$( $PYCODESTYLE_BUILD --version 2> /dev/null)
EXPECTED_PYCODESTYLE=$( (python -c 'from distutils.version import LooseVersion; EXPECTED_PYCODESTYLE=$( (python3 -c 'from distutils.version import LooseVersion;
print(LooseVersion("""'${VERSION[0]}'""") >= LooseVersion("""'$MINIMUM_PYCODESTYLE'"""))')\ print(LooseVersion("""'${VERSION[0]}'""") >= LooseVersion("""'$MINIMUM_PYCODESTYLE'"""))')\
2> /dev/null) 2> /dev/null)
@ -96,7 +96,7 @@ function pycodestyle_test {
fi fi
echo "starting pycodestyle test..." echo "starting pycodestyle test..."
PYCODESTYLE_REPORT=$( (python "$PYCODESTYLE_SCRIPT_PATH" --config=dev/tox.ini $1) 2>&1) PYCODESTYLE_REPORT=$( (python3 "$PYCODESTYLE_SCRIPT_PATH" --config=dev/tox.ini $1) 2>&1)
PYCODESTYLE_STATUS=$? PYCODESTYLE_STATUS=$?
else else
# we have the right version installed, so run locally # we have the right version installed, so run locally
@ -130,7 +130,7 @@ function flake8_test {
FLAKE8_VERSION="$($FLAKE8_BUILD --version 2> /dev/null)" FLAKE8_VERSION="$($FLAKE8_BUILD --version 2> /dev/null)"
VERSION=($FLAKE8_VERSION) VERSION=($FLAKE8_VERSION)
EXPECTED_FLAKE8=$( (python -c 'from distutils.version import LooseVersion; EXPECTED_FLAKE8=$( (python3 -c 'from distutils.version import LooseVersion;
print(LooseVersion("""'${VERSION[0]}'""") >= LooseVersion("""'$MINIMUM_FLAKE8'"""))') \ print(LooseVersion("""'${VERSION[0]}'""") >= LooseVersion("""'$MINIMUM_FLAKE8'"""))') \
2> /dev/null) 2> /dev/null)
@ -175,7 +175,7 @@ function pydocstyle_test {
fi fi
PYDOCSTYLE_VERSION="$($PYDOCSTYLEBUILD --version 2> /dev/null)" PYDOCSTYLE_VERSION="$($PYDOCSTYLEBUILD --version 2> /dev/null)"
EXPECTED_PYDOCSTYLE=$(python -c 'from distutils.version import LooseVersion; \ EXPECTED_PYDOCSTYLE=$(python3 -c 'from distutils.version import LooseVersion; \
print(LooseVersion("""'$PYDOCSTYLE_VERSION'""") >= LooseVersion("""'$MINIMUM_PYDOCSTYLE'"""))' \ print(LooseVersion("""'$PYDOCSTYLE_VERSION'""") >= LooseVersion("""'$MINIMUM_PYDOCSTYLE'"""))' \
2> /dev/null) 2> /dev/null)