Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/pythonbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.txt', format('requirements{0}.txt', matrix.spark-version-suffix))) }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip==21.2.4 setuptools wheel
make setup${{ matrix.spark-version-suffix }}
pip freeze
- name: Test with coverage
Expand Down Expand Up @@ -99,7 +98,6 @@ jobs:
key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.txt', format('plugins/{0}/requirements.txt', matrix.plugin-names ))) }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip==21.2.4 setuptools wheel

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pip is now installed in the setup make target.

make setup
cd plugins/${{ matrix.plugin-names }}
pip install -e .
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ help:

.PHONY: install-piptools
install-piptools:
pip install -U pip-tools pip==21.2.4
pip install -U pip-tools setuptools wheel pip==22.0.3

.PHONY: update_boilerplate
update_boilerplate:
Expand Down
109 changes: 52 additions & 57 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
#
# pip-compile dev-requirements.in
# make dev-requirements.txt
#
-e file:.#egg=flytekit
# via
# -c requirements.txt
# pytest-flyte
arrow==1.2.1
arrow==1.2.2
# via
# -c requirements.txt
# jinja2-time
Expand All @@ -18,17 +18,13 @@ attrs==20.3.0
# jsonschema
# pytest
# pytest-docker
backports.entry-points-selectable==1.1.1
# via virtualenv
bcrypt==3.2.0
# via
# -c requirements.txt
# paramiko
# via paramiko
binaryornot==0.4.4
# via
# -c requirements.txt
# cookiecutter
cachetools==4.2.4
cachetools==5.0.0
# via google-auth
certifi==2021.10.8
# via
Expand All @@ -46,15 +42,15 @@ chardet==4.0.0
# via
# -c requirements.txt
# binaryornot
charset-normalizer==2.0.9
charset-normalizer==2.0.11
# via
# -c requirements.txt
# requests
checksumdir==1.2.0
# via
# -c requirements.txt
# flytekit
click==7.1.2
click==8.0.3
# via
# -c requirements.txt
# cookiecutter
Expand All @@ -69,29 +65,30 @@ cookiecutter==1.7.3
# via
# -c requirements.txt
# flytekit
coverage[toml]==6.2
coverage[toml]==6.3.1
# via -r dev-requirements.in
croniter==1.1.0
croniter==1.2.0
# via
# -c requirements.txt
# flytekit
cryptography==36.0.1
# via
# -c requirements.txt
# paramiko
# secretstorage
dataclasses-json==0.5.6
# via
# -c requirements.txt
# flytekit
decorator==5.1.0
decorator==5.1.1
# via
# -c requirements.txt
# retry
deprecated==1.2.13
# via
# -c requirements.txt
# flytekit
diskcache==5.3.0
diskcache==5.4.0
# via
# -c requirements.txt
# flytekit
Expand All @@ -117,18 +114,18 @@ docstring-parser==0.13
# via
# -c requirements.txt
# flytekit
filelock==3.4.0
filelock==3.4.2
# via virtualenv
flyteidl==0.21.17
flyteidl==0.22.0
# via
# -c requirements.txt
# flytekit
google-api-core[grpc]==2.4.0
google-api-core[grpc]==2.5.0
# via
# google-cloud-bigquery
# google-cloud-bigquery-storage
# google-cloud-core
google-auth==2.3.3
google-auth==2.6.0
# via
# google-api-core
# google-cloud-core
Expand All @@ -140,7 +137,7 @@ google-cloud-core==2.2.2
# via google-cloud-bigquery
google-crc32c==1.3.0
# via google-resumable-media
google-resumable-media==2.1.0
google-resumable-media==2.2.0
# via google-cloud-bigquery
googleapis-common-protos==1.54.0
# via
Expand All @@ -155,18 +152,23 @@ grpcio==1.43.0
# grpcio-status
grpcio-status==1.43.0
# via google-api-core
identify==2.4.0
identify==2.4.8
# via pre-commit
idna==3.3
# via
# -c requirements.txt
# requests
importlib-metadata==4.10.0
importlib-metadata==4.10.1
# via
# -c requirements.txt
# keyring
iniconfig==1.1.1
# via pytest
jeepney==0.7.1
# via
# -c requirements.txt
# keyring
# secretstorage
jinja2==3.0.3
# via
# -c requirements.txt
Expand All @@ -183,11 +185,11 @@ jsonschema==3.2.0
# via
# -c requirements.txt
# docker-compose
keyring==23.4.0
keyring==23.5.0
# via
# -c requirements.txt
# flytekit
libcst==0.4.0
libcst==0.4.1
# via google-cloud-bigquery-storage
markupsafe==2.0.1
# via
Expand All @@ -209,14 +211,14 @@ marshmallow-jsonschema==0.13.0
# flytekit
mock==4.0.3
# via -r dev-requirements.in
mypy==0.930
mypy==0.931
# via -r dev-requirements.in
mypy-extensions==0.4.3
# via
# -c requirements.txt
# mypy
# typing-inspect
natsort==8.0.2
natsort==8.1.0
# via
# -c requirements.txt
# flytekit
Expand All @@ -229,34 +231,29 @@ numpy==1.21.5
# pyarrow
packaging==21.3
# via
# -c requirements.txt
# google-cloud-bigquery
# pytest
pandas==1.3.5
# via
# -c requirements.txt
# flytekit
paramiko==2.8.1
# via
# -c requirements.txt
# docker
platformdirs==2.4.0
# via
# -c requirements.txt
# virtualenv
paramiko==2.9.2
# via docker
platformdirs==2.4.1
# via virtualenv
pluggy==1.0.0
# via pytest
poyo==0.5.0
# via
# -c requirements.txt
# cookiecutter
pre-commit==2.16.0
pre-commit==2.17.0
# via -r dev-requirements.in
proto-plus==1.19.8
proto-plus==1.20.0
# via
# google-cloud-bigquery
# google-cloud-bigquery-storage
protobuf==3.19.1
protobuf==3.19.4
# via
# -c requirements.txt
# flyteidl
Expand Down Expand Up @@ -285,15 +282,11 @@ pycparser==2.21
# via
# -c requirements.txt
# cffi
pynacl==1.4.0
# via
# -c requirements.txt
# paramiko
pyparsing==3.0.6
# via
# -c requirements.txt
# packaging
pyrsistent==0.18.0
pynacl==1.5.0
# via paramiko
pyparsing==3.0.7
# via packaging
pyrsistent==0.18.1
# via
# -c requirements.txt
# jsonschema
Expand All @@ -306,7 +299,7 @@ pytest-docker==0.10.3
# via pytest-flyte
pytest-flyte @ git+https://github.com/flyteorg/pytest-flyte@main
# via -r dev-requirements.in
python-dateutil==2.8.1
python-dateutil==2.8.2
# via
# -c requirements.txt
# arrow
Expand Down Expand Up @@ -339,11 +332,11 @@ pyyaml==5.4.1
# docker-compose
# libcst
# pre-commit
regex==2021.11.10
regex==2022.1.18
# via
# -c requirements.txt
# docker-image-py
requests==2.26.0
requests==2.27.1
# via
# -c requirements.txt
# cookiecutter
Expand All @@ -353,7 +346,7 @@ requests==2.26.0
# google-api-core
# google-cloud-bigquery
# responses
responses==0.16.0
responses==0.18.0
# via
# -c requirements.txt
# flytekit
Expand All @@ -363,6 +356,10 @@ retry==0.9.2
# flytekit
rsa==4.8
# via google-auth
secretstorage==3.3.1
# via
# -c requirements.txt
# keyring
six==1.16.0
# via
# -c requirements.txt
Expand All @@ -372,9 +369,7 @@ six==1.16.0
# google-auth
# grpcio
# jsonschema
# pynacl
# python-dateutil
# responses
# virtualenv
# websocket-client
sortedcontainers==2.4.0
Expand All @@ -395,14 +390,14 @@ toml==0.10.2
# via
# pre-commit
# pytest
tomli==1.2.3
tomli==2.0.0
# via
# -c requirements.txt
# coverage
# mypy
typing-extensions==4.0.1
# via
# -c requirements.txt
# flytekit
# libcst
# mypy
# typing-inspect
Expand All @@ -411,13 +406,13 @@ typing-inspect==0.7.1
# -c requirements.txt
# dataclasses-json
# libcst
urllib3==1.26.7
urllib3==1.26.8
# via
# -c requirements.txt
# flytekit
# requests
# responses
virtualenv==20.10.0
virtualenv==20.13.1
# via pre-commit
websocket-client==0.59.0
# via
Expand All @@ -432,7 +427,7 @@ wrapt==1.13.3
# -c requirements.txt
# deprecated
# flytekit
zipp==3.6.0
zipp==3.7.0
# via
# -c requirements.txt
# importlib-metadata
Expand Down
Loading