Skip to content

Commit

Permalink
SDK - Added pinned dependency snapshot (kubeflow#3303)
Browse files Browse the repository at this point in the history
* SDK - Added pinned dependency snapshot

* Downgraded zipp

The zipp package has dropped support for python3.5. https://zipp.readthedocs.io/en/latest/history.html#v2-0-0
jaraco/zipp#28

* Fixing sample building in the backend Dockerfile

Installing SDK using pip.
Using SDK's requirements.txt.

* Enabled kubernetes v11

* Reverted the backend/Dockerfile for now

* Fixed the version of kfp-server-api
  • Loading branch information
Ark-kun authored and Jeffwan committed Dec 9, 2020
1 parent d21503b commit 4b4b94f
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 28 deletions.
23 changes: 23 additions & 0 deletions sdk/python/requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Deprecated
PyYAML

# kfp.components
cloudpickle
strip-hints>=0.1.8

# kfp.dsl
argo-models==2.2.1a #2.2.1a is equivalent to argo 2.2.1
jsonschema>=3.0.1
kubernetes>=8.0.0, <12.0.0

# kfp.Client
kfp-server-api>=0.2.5, <0.4.0 #Update the upper version whenever a new version of the kfp-server-api package is released. Update the lower version when there is a breaking change in kfp-server-api, or kfp sdk depends on new api changes in kfp-server-api.

# kfp.Client GCP auth
google-cloud-storage>=1.13.0
google-auth>=1.6.1
requests_toolbelt>=0.8.0

# CLI
tabulate
click
67 changes: 48 additions & 19 deletions sdk/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,48 @@
urllib3>=1.15,<1.25 #Fixing the version conflict with the "requests" package caused by the kubernetes package
six>=1.10
certifi
python-dateutil
PyYAML
google-cloud-storage>=1.13.0
kubernetes>=8.0.0, <=10.0.0
PyJWT>=1.6.4
cryptography>=2.4.2
google-auth>=1.6.1
requests_toolbelt>=0.8.0
cloudpickle==1.1.1
kfp-server-api==0.3.0
argo-models == 2.2.1a
jsonschema >= 3.0.1
tabulate == 0.8.3
click == 7.0
Deprecated
strip-hints
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements.txt requirements.in
#
argo-models==2.2.1a # via -r requirements.in
attrs==19.3.0 # via jsonschema
cachetools==4.0.0 # via google-auth
certifi==2019.11.28 # via kfp-server-api, kubernetes, requests
chardet==3.0.4 # via requests
click==7.1.1 # via -r requirements.in
cloudpickle==1.3.0 # via -r requirements.in
deprecated==1.2.7 # via -r requirements.in
google-api-core==1.16.0 # via google-cloud-core
google-auth==1.11.3 # via -r requirements.in, google-api-core, google-cloud-storage, kubernetes
google-cloud-core==1.3.0 # via google-cloud-storage
google-cloud-storage==1.26.0 # via -r requirements.in
google-resumable-media==0.5.0 # via google-cloud-storage
googleapis-common-protos==1.51.0 # via google-api-core
idna==2.9 # via requests
importlib-metadata==1.5.0 # via jsonschema
jsonschema==3.2.0 # via -r requirements.in
kfp-server-api==0.3.0 # via -r requirements.in
kubernetes==11.0.0 # via -r requirements.in, argo-models
oauthlib==3.1.0 # via requests-oauthlib
protobuf==3.11.3 # via google-api-core, googleapis-common-protos
pyasn1-modules==0.2.8 # via google-auth
pyasn1==0.4.8 # via pyasn1-modules, rsa
pyrsistent==0.15.7 # via jsonschema
python-dateutil==2.8.1 # via kfp-server-api, kubernetes
pytz==2019.3 # via google-api-core
pyyaml==5.3.1 # via -r requirements.in, kubernetes
requests-oauthlib==1.3.0 # via kubernetes
requests-toolbelt==0.9.1 # via -r requirements.in
requests==2.23.0 # via google-api-core, kubernetes, requests-oauthlib, requests-toolbelt
rsa==4.0 # via google-auth
six==1.14.0 # via google-api-core, google-auth, google-resumable-media, jsonschema, kfp-server-api, kubernetes, protobuf, pyrsistent, python-dateutil, websocket-client
strip-hints==0.1.8 # via -r requirements.in
tabulate==0.8.6 # via -r requirements.in
urllib3==1.25.8 # via kfp-server-api, kubernetes, requests
websocket-client==0.57.0 # via kubernetes
wheel==0.34.2 # via strip-hints
wrapt==1.12.1 # via deprecated
zipp==1.2.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
12 changes: 3 additions & 9 deletions sdk/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,21 @@
#VERSION = .... Change the version in kfp/__init__.py

REQUIRES = [
'urllib3>=1.15,<1.25', #Fixing the version conflict with the "requests" package
'six >= 1.10',
'certifi',
'python-dateutil',
'PyYAML',
'google-cloud-storage>=1.13.0',
'kubernetes>=8.0.0, <12.0.0',
'PyJWT>=1.6.4',
'cryptography>=2.4.2',
'google-auth>=1.6.1',
'requests_toolbelt>=0.8.0',
'cloudpickle==1.1.1',
'cloudpickle',
# Update the upper version whenever a new major version of the
# kfp-server-api package is released. Update the lower version when there is
# a breaking change in kfp-server-api, or kfp sdk depends on new api changes
# in kfp-server-api.
'kfp-server-api>=0.2.5, <0.4.0',
'argo-models == 2.2.1a', #2.2.1a is equivalent to argo 2.2.1
'jsonschema >= 3.0.1',
'tabulate == 0.8.3',
'click == 7.0',
'tabulate',
'click',
'Deprecated',
'strip-hints',
]
Expand Down

0 comments on commit 4b4b94f

Please sign in to comment.