Skip to content

Commit

Permalink
CI for spark2
Browse files Browse the repository at this point in the history
Signed-off-by: Hongxin Liang <[email protected]>
  • Loading branch information
honnix committed Mar 26, 2021
1 parent 7afe94d commit 0d98239
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 42 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pythonbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
include:
python-version: [3.7, 3.8]
spark-version-suffix: ["", "-spark2"]
exclude:
- python-version: 3.8
spark-version-suffix: "-spark3"
- python-version: 3.7
spark-version-suffix: ""
spark-version-suffix: "-spark2"

steps:
- uses: actions/checkout@v2
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ install-piptools:
setup: install-piptools ## Install requirements
pip-sync requirements.txt dev-requirements.txt

.PHONY: setup-spark3
setup-spark3: install-piptools ## Install requirements
pip-sync requirements-spark3.txt dev-requirements.txt
.PHONY: setup-spark2
setup-spark2: install-piptools ## Install requirements
pip-sync requirements-spark2.txt dev-requirements.txt

.PHONY: fmt
fmt: ## Format code with black and isort
Expand Down Expand Up @@ -47,9 +47,9 @@ unit_test:
pytest tests/scripts
pytest plugins/tests

requirements-spark3.txt: export CUSTOM_COMPILE_COMMAND := make requirements-spark3.txt
requirements-spark3.txt: requirements-spark3.in install-piptools
$(call PIP_COMPILE,requirements-spark3.in)
requirements-spark2.txt: export CUSTOM_COMPILE_COMMAND := make requirements-spark2.txt
requirements-spark2.txt: requirements-spark2.in install-piptools
$(call PIP_COMPILE,requirements-spark2.in)

requirements.txt: export CUSTOM_COMPILE_COMMAND := make requirements.txt
requirements.txt: install-piptools
Expand All @@ -64,7 +64,7 @@ doc-requirements.txt: dev-requirements.txt install-piptools
$(call PIP_COMPILE,doc-requirements.in)

.PHONY: requirements
requirements: requirements.txt dev-requirements.txt requirements-spark3.txt doc-requirements.txt ## Compile requirements
requirements: requirements.txt dev-requirements.txt requirements-spark2.txt doc-requirements.txt ## Compile requirements

# TODO: Change this in the future to be all of flytekit
.PHONY: coverage
Expand All @@ -80,6 +80,6 @@ update_version:
# it exits with exit code 1 and github actions aborts the build.
grep "$(PLACEHOLDER)" "flytekit/__init__.py"
sed -i "s/$(PLACEHOLDER)/__version__ = \"${VERSION}\"/g" "flytekit/__init__.py"

grep "$(PLACEHOLDER)" "setup.py"
sed -i "s/$(PLACEHOLDER)/__version__ = \"${VERSION}\"/g" "setup.py"
1 change: 0 additions & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ attrs==20.3.0
# pytest
black==19.10b0
# via
# -c requirements.txt
# -r dev-requirements.in
# flake8-black
click==7.1.2
Expand Down
17 changes: 10 additions & 7 deletions doc-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ ansiwrap==0.8.4
# via papermill
appdirs==1.4.4
# via black
appnope==0.1.2
# via
# ipykernel
# ipython
astroid==2.5.1
# via sphinx-autoapi
async-generator==1.10
Expand All @@ -41,9 +37,9 @@ black==19.10b0
# papermill
bleach==3.3.0
# via nbconvert
boto3==1.17.36
boto3==1.17.39
# via sagemaker-training
botocore==1.20.36
botocore==1.20.39
# via
# boto3
# s3transfer
Expand All @@ -64,10 +60,11 @@ click==7.1.2
# papermill
croniter==1.0.10
# via flytekit
cryptography==3.4.6
cryptography==3.4.7
# via
# -r doc-requirements.in
# paramiko
# secretstorage
css-html-js-minify==2.5.5
# via sphinx-material
dataclasses-json==0.5.2
Expand Down Expand Up @@ -120,6 +117,10 @@ ipython==7.21.0
# via ipykernel
jedi==0.18.0
# via ipython
jeepney==0.6.0
# via
# keyring
# secretstorage
jinja2==2.11.3
# via
# nbconvert
Expand Down Expand Up @@ -287,6 +288,8 @@ scantree==0.0.1
# via dirhash
scipy==1.6.2
# via sagemaker-training
secretstorage==3.3.1
# via keyring
six==1.15.0
# via
# bcrypt
Expand Down
2 changes: 1 addition & 1 deletion requirements-spark3.in → requirements-spark2.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.[all-spark3]
.[all-spark2.4]
-e file:.#egg=flytekit
28 changes: 16 additions & 12 deletions requirements-spark3.txt → requirements-spark2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# make requirements-spark3.txt
# make requirements-spark2.txt
#
-e file:.#egg=flytekit
# via -r requirements-spark3.in
# via -r requirements-spark2.in
ansiwrap==0.8.4
# via papermill
appdirs==1.4.4
# via black
appnope==0.1.2
# via
# ipykernel
# ipython
async-generator==1.10
# via nbclient
attrs==20.3.0
Expand All @@ -31,9 +27,9 @@ black==19.10b0
# papermill
bleach==3.3.0
# via nbconvert
boto3==1.17.36
boto3==1.17.39
# via sagemaker-training
botocore==1.20.36
botocore==1.20.39
# via
# boto3
# s3transfer
Expand All @@ -54,8 +50,10 @@ click==7.1.2
# papermill
croniter==1.0.10
# via flytekit
cryptography==3.4.6
# via paramiko
cryptography==3.4.7
# via
# paramiko
# secretstorage
dataclasses-json==0.5.2
# via flytekit
decorator==4.4.2
Expand Down Expand Up @@ -100,6 +98,10 @@ ipython==7.21.0
# via ipykernel
jedi==0.18.0
# via ipython
jeepney==0.6.0
# via
# keyring
# secretstorage
jinja2==2.11.3
# via nbconvert
jmespath==0.10.0
Expand Down Expand Up @@ -189,7 +191,7 @@ psutil==5.8.0
# via sagemaker-training
ptyprocess==0.7.0
# via pexpect
py4j==0.10.9
py4j==0.10.7
# via pyspark
py==1.10.0
# via retry
Expand All @@ -208,7 +210,7 @@ pyparsing==2.4.7
# via packaging
pyrsistent==0.17.3
# via jsonschema
pyspark==3.1.1
pyspark==2.4.7
# via flytekit
python-dateutil==2.8.1
# via
Expand Down Expand Up @@ -250,6 +252,8 @@ scantree==0.0.1
# via dirhash
scipy==1.6.2
# via sagemaker-training
secretstorage==3.3.1
# via keyring
six==1.15.0
# via
# bcrypt
Expand Down
20 changes: 12 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ ansiwrap==0.8.4
# via papermill
appdirs==1.4.4
# via black
appnope==0.1.2
# via
# ipykernel
# ipython
async-generator==1.10
# via nbclient
attrs==20.3.0
Expand All @@ -31,9 +27,9 @@ black==19.10b0
# papermill
bleach==3.3.0
# via nbconvert
boto3==1.17.36
boto3==1.17.39
# via sagemaker-training
botocore==1.20.36
botocore==1.20.39
# via
# boto3
# s3transfer
Expand All @@ -54,8 +50,10 @@ click==7.1.2
# papermill
croniter==1.0.10
# via flytekit
cryptography==3.4.6
# via paramiko
cryptography==3.4.7
# via
# paramiko
# secretstorage
dataclasses-json==0.5.2
# via flytekit
decorator==4.4.2
Expand Down Expand Up @@ -100,6 +98,10 @@ ipython==7.21.0
# via ipykernel
jedi==0.18.0
# via ipython
jeepney==0.6.0
# via
# keyring
# secretstorage
jinja2==2.11.3
# via nbconvert
jmespath==0.10.0
Expand Down Expand Up @@ -250,6 +252,8 @@ scantree==0.0.1
# via dirhash
scipy==1.6.2
# via sagemaker-training
secretstorage==3.3.1
# via keyring
six==1.15.0
# via
# bcrypt
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"notebook": notebook,
"sagemaker": sagemaker,
"all-spark2.4": spark + all_but_spark,
"all-spark3": spark3 + all_but_spark,
"all": spark3 + all_but_spark,
}

Expand Down

0 comments on commit 0d98239

Please sign in to comment.