Skip to content

Commit

Permalink
Bump codecov gh action and pin plugins requirements in tests (#1026)
Browse files Browse the repository at this point in the history
* Bump codecov gh action and pin plugins requirements in tests

Signed-off-by: Eduardo Apolinario <[email protected]>

* Fix flytedecks plugin name in requirements files

Signed-off-by: Eduardo Apolinario <[email protected]>

* Skip greatexpectations plugin tests on python 3.10

Signed-off-by: Eduardo Apolinario <[email protected]>

* Bump requirements for great-expectations plugin

Signed-off-by: Eduardo Apolinario <[email protected]>

* Regenerate modin plugin requirements file

Signed-off-by: Eduardo Apolinario <[email protected]>

* Remove `make setup` from plugins tests

Signed-off-by: Eduardo Apolinario <[email protected]>

* Revert "Remove `make setup` from plugins tests"

This reverts commit 3ba7348.

Signed-off-by: Eduardo Apolinario <[email protected]>

Co-authored-by: Eduardo Apolinario <[email protected]>
  • Loading branch information
eapolinario and eapolinario authored Jun 2, 2022
1 parent 14f737e commit 0aa07eb
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 49 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/pythonbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ jobs:
# Issue tracked in https://github.com/ray-project/ray/issues/19116.
- python-version: 3.10
plugin-names: "flytekit-modin"
# Great-expectations does not support python 3.10 yet
# https://github.com/great-expectations/great_expectations/blob/develop/setup.py#L87-L89
- python-version: 3.10
plugin-names: "flytekit-greatexpectations"
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -104,7 +108,7 @@ jobs:
run: |
make setup
cd plugins/${{ matrix.plugin-names }}
pip install -e .
pip install -r requirements.txt
if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi
pip install --no-deps -U https://github.com/flyteorg/flytekit/archive/${{ github.sha }}.zip#egg=flytekit
pip freeze
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
repos:
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
rev: 4.0.1
hooks:
- id: flake8
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.9.3
rev: 5.10.1
hooks:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.2.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.7.2.1
rev: v0.8.0.4
hooks:
- id: shellcheck
2 changes: 1 addition & 1 deletion plugins/flytekit-deck-standard/requirements.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.
-e file:.#egg=flytekitplugins-deck
-e file:.#egg=flytekitplugins-deck-standard
2 changes: 1 addition & 1 deletion plugins/flytekit-deck-standard/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
#
# pip-compile requirements.in
#
-e file:.#egg=flytekitplugins-deck
-e file:.#egg=flytekitplugins-deck-standard
# via -r requirements.in
66 changes: 32 additions & 34 deletions plugins/flytekit-greatexpectations/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.7
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile requirements.in
Expand All @@ -14,6 +14,8 @@ argon2-cffi-bindings==21.2.0
# via argon2-cffi
arrow==1.2.2
# via jinja2-time
asttokens==2.0.5
# via stack-data
attrs==21.4.0
# via jsonschema
backcall==0.2.0
Expand Down Expand Up @@ -47,7 +49,7 @@ cloudpickle==2.1.0
# via flytekit
colorama==0.4.4
# via great-expectations
cookiecutter==1.7.3
cookiecutter==2.1.1
# via flytekit
croniter==1.3.5
# via flytekit
Expand Down Expand Up @@ -80,40 +82,39 @@ entrypoints==0.4
# altair
# jupyter-client
# nbconvert
executing==0.8.3
# via stack-data
fastjsonschema==2.15.3
# via nbformat
flyteidl==1.0.1
# via flytekit
flytekit==1.1.0b1
flytekit==1.1.0b2
# via flytekitplugins-great-expectations
googleapis-common-protos==1.56.1
googleapis-common-protos==1.56.2
# via
# flyteidl
# grpcio-status
great-expectations==0.15.6
great-expectations==0.15.7
# via flytekitplugins-great-expectations
greenlet==1.1.2
# via sqlalchemy
grpcio==1.46.1
grpcio==1.46.3
# via
# flytekit
# grpcio-status
grpcio-status==1.46.1
grpcio-status==1.46.3
# via flytekit
idna==3.3
# via requests
importlib-metadata==4.11.3
importlib-metadata==4.11.4
# via
# click
# great-expectations
# jsonschema
# keyring
# sqlalchemy
importlib-resources==5.7.1
# via jsonschema
ipykernel==6.13.0
# via notebook
ipython==7.33.0
ipython==8.4.0
# via
# great-expectations
# ipykernel
Expand All @@ -139,7 +140,7 @@ jsonpatch==1.32
# via great-expectations
jsonpointer==2.3
# via jsonpatch
jsonschema==4.5.1
jsonschema==4.6.0
# via
# altair
# great-expectations
Expand All @@ -157,13 +158,13 @@ jupyter-core==4.10.0
# notebook
jupyterlab-pygments==0.2.2
# via nbconvert
keyring==23.5.0
keyring==23.5.1
# via flytekit
markupsafe==2.1.1
# via
# jinja2
# nbconvert
marshmallow==3.15.0
marshmallow==3.16.0
# via
# dataclasses-json
# marshmallow-enum
Expand All @@ -184,7 +185,7 @@ mypy-extensions==0.4.3
# via typing-inspect
natsort==8.1.0
# via flytekit
nbclient==0.6.3
nbclient==0.6.4
# via nbconvert
nbconvert==6.5.0
# via notebook
Expand All @@ -202,10 +203,9 @@ nest-asyncio==1.5.5
# notebook
notebook==6.4.11
# via great-expectations
numpy==1.21.6
numpy==1.22.4
# via
# altair
# flytekit
# great-expectations
# pandas
# pyarrow
Expand All @@ -216,7 +216,7 @@ packaging==21.3
# ipykernel
# marshmallow
# nbconvert
pandas==1.3.5
pandas==1.4.2
# via
# altair
# flytekit
Expand All @@ -229,8 +229,6 @@ pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
poyo==0.5.0
# via cookiecutter
prometheus-client==0.14.1
# via notebook
prompt-toolkit==3.0.29
Expand All @@ -244,12 +242,14 @@ protobuf==3.20.1
# protoc-gen-swagger
protoc-gen-swagger==0.1.0
# via flyteidl
psutil==5.9.0
psutil==5.9.1
# via ipykernel
ptyprocess==0.7.0
# via
# pexpect
# terminado
pure-eval==0.2.2
# via stack-data
py==1.11.0
# via retry
pyarrow==6.0.1
Expand Down Expand Up @@ -288,7 +288,9 @@ pytz==2022.1
pytz-deprecation-shim==0.1.0.post0
# via tzlocal
pyyaml==6.0
# via flytekit
# via
# cookiecutter
# flytekit
pyzmq==23.0.0
# via
# jupyter-client
Expand All @@ -302,36 +304,36 @@ requests==2.27.1
# flytekit
# great-expectations
# responses
responses==0.20.0
responses==0.21.0
# via flytekit
retry==0.9.2
# via flytekit
ruamel-yaml==0.17.17
# via great-expectations
ruamel-yaml-clib==0.2.6
# via ruamel-yaml
scipy==1.7.3
scipy==1.8.1
# via great-expectations
secretstorage==3.3.2
# via keyring
send2trash==1.8.0
# via notebook
singledispatchmethod==1.0
# via flytekit
six==1.16.0
# via
# asttokens
# bleach
# cookiecutter
# grpcio
# python-dateutil
sortedcontainers==2.4.0
# via flytekit
soupsieve==2.3.2.post1
# via beautifulsoup4
sqlalchemy==1.4.36
sqlalchemy==1.4.37
# via
# -r requirements.in
# flytekitplugins-great-expectations
stack-data==0.2.0
# via ipython
statsd==3.3.0
# via flytekit
termcolor==1.1.0
Expand All @@ -352,7 +354,7 @@ tornado==6.1
# terminado
tqdm==4.64.0
# via great-expectations
traitlets==5.2.1.post0
traitlets==5.2.2.post1
# via
# ipykernel
# ipython
Expand All @@ -365,12 +367,8 @@ traitlets==5.2.1.post0
# notebook
typing-extensions==4.2.0
# via
# argon2-cffi
# arrow
# flytekit
# great-expectations
# importlib-metadata
# jsonschema
# typing-inspect
typing-inspect==0.7.1
# via dataclasses-json
Expand Down
2 changes: 0 additions & 2 deletions plugins/flytekit-modin/requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
grpcio<=1.43.0
grpcio-status<=1.43.0
.
-e file:.#egg=flytekitplugins-modin
14 changes: 8 additions & 6 deletions plugins/flytekit-modin/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile requirements.in
Expand Down Expand Up @@ -57,9 +57,9 @@ filelock==3.6.0
# via
# ray
# virtualenv
flyteidl==0.24.21
flyteidl==1.0.1
# via flytekit
flytekit==1.0.0b3
flytekit==1.1.0b2
# via flytekitplugins-modin
frozenlist==1.3.0
# via
Expand All @@ -75,20 +75,20 @@ googleapis-common-protos==1.56.0
# grpcio-status
grpcio==1.43.0
# via
# -r requirements.in
# flytekit
# flytekitplugins-modin
# grpcio-status
# ray
grpcio-status==1.43.0
# via
# -r requirements.in
# flytekit
# flytekitplugins-modin
idna==3.3
# via requests
importlib-metadata==4.11.3
# via keyring
importlib-resources==5.7.1
# via jsonschema
jeepney==0.8.0
# via
# keyring
Expand Down Expand Up @@ -231,4 +231,6 @@ wrapt==1.14.0
# deprecated
# flytekit
zipp==3.8.0
# via importlib-metadata
# via
# importlib-metadata
# importlib-resources

0 comments on commit 0aa07eb

Please sign in to comment.