Skip to content

Commit

Permalink
fix: increase TFX version from 0.20.2 to 0.22.0. Fixes #4084, fixes #…
Browse files Browse the repository at this point in the history 
…4114 (#4133)

* enable pagination when expanding experiment in both the home page and the archive page

* Revert "enable pagination when expanding experiment in both the home page and the archive page"

This reverts commit 5b67273.

* tfx 0.21.2 -> 0.22.2

* tfx 0.20.2 -> 0.22.0

* update requirements.txt
  • Loading branch information
@jingzhang36
jingzhang36 authored Jul 2, 2020
1 parent 79f6a40 commit ce51c59
Show file tree
Hide file tree
Showing 7 changed files with 188 additions and 166 deletions.
2 changes: 1 addition & 1 deletion backend/requirements.in
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tfx==0.21.2
tfx==0.22.0
172 changes: 94 additions & 78 deletions backend/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,132 +2,148 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile requirements.in
# pip-compile --output-file=- -
#
absl-py==0.8.1 # via ml-metadata, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl
apache-beam[gcp]==2.17.0 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl
astor==0.8.1 # via tensorflow
apache-beam[gcp]==2.22.0 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl
astunparse==1.6.3 # via tensorflow
attrs==19.3.0 # via jsonschema
avro-python3==1.9.1 # via apache-beam, tensorflow-data-validation, tensorflow-model-analysis, tfx-bsl
backcall==0.1.0 # via ipython
bleach==3.1.1 # via nbconvert
avro-python3==1.9.2.1 # via apache-beam
backcall==0.2.0 # via ipython
bleach==3.1.5 # via nbconvert
cachetools==3.1.1 # via apache-beam, google-auth
certifi==2019.11.28 # via requests
certifi==2020.6.20 # via kubernetes, requests
chardet==3.0.4 # via requests
click==7.0 # via tfx
click==7.1.2 # via tfx
colorama==0.4.3 # via keras-tuner
crcmod==1.7 # via apache-beam
decorator==4.4.1 # via ipython, traitlets
decorator==4.4.2 # via ipython, traitlets
defusedxml==0.6.0 # via nbconvert
dill==0.3.0 # via apache-beam
docker==4.2.0 # via tfx
dill==0.3.1.1 # via apache-beam
docker==4.2.2 # via tfx
docopt==0.6.2 # via hdfs
entrypoints==0.3 # via nbconvert
fastavro==0.21.24 # via apache-beam
fastavro==0.23.5 # via apache-beam
fasteners==0.15 # via google-apitools
future==0.18.2 # via apache-beam
gast==0.2.2 # via tensorflow
google-api-core[grpc]==1.16.0 # via google-cloud-bigtable, google-cloud-core, google-cloud-datastore, google-cloud-pubsub
google-api-python-client==1.7.11 # via tfx
google-apitools==0.5.28 # via apache-beam
future==0.18.2 # via apache-beam, keras-tuner
gast==0.3.3 # via tensorflow
google-api-core[grpc,grpcgcp]==1.21.0 # via google-api-python-client, google-cloud-bigquery, google-cloud-bigtable, google-cloud-core, google-cloud-datastore, google-cloud-dlp, google-cloud-language, google-cloud-pubsub, google-cloud-spanner, google-cloud-videointelligence, google-cloud-vision
google-api-python-client==1.9.3 # via tfx, tfx-bsl
google-apitools==0.5.31 # via apache-beam
google-auth-httplib2==0.0.3 # via google-api-python-client
google-auth-oauthlib==0.4.1 # via tensorboard
google-auth==1.11.2 # via google-api-core, google-api-python-client, google-auth-httplib2, google-auth-oauthlib, tensorboard
google-cloud-bigquery==1.17.1 # via apache-beam
google-auth==1.18.0 # via google-api-core, google-api-python-client, google-auth-httplib2, google-auth-oauthlib, google-cloud-bigquery, kubernetes, tensorboard
google-cloud-bigquery==1.24.0 # via apache-beam
google-cloud-bigtable==1.0.0 # via apache-beam
google-cloud-core==1.3.0 # via apache-beam, google-cloud-bigquery, google-cloud-bigtable, google-cloud-datastore
google-cloud-core==1.3.0 # via apache-beam, google-cloud-bigquery, google-cloud-bigtable, google-cloud-datastore, google-cloud-spanner
google-cloud-datastore==1.7.4 # via apache-beam
google-cloud-dlp==0.13.0 # via apache-beam
google-cloud-language==1.3.0 # via apache-beam
google-cloud-pubsub==1.0.2 # via apache-beam
google-pasta==0.1.8 # via tensorflow
google-resumable-media==0.4.1 # via google-cloud-bigquery
googleapis-common-protos[grpc]==1.51.0 # via google-api-core, grpc-google-iam-v1, tensorflow-metadata
grpc-google-iam-v1==0.12.3 # via google-cloud-bigtable, google-cloud-pubsub
grpcio==1.27.1 # via apache-beam, google-api-core, googleapis-common-protos, grpc-google-iam-v1, tensorboard, tensorflow, tensorflow-serving-api, tfx
h5py==2.10.0 # via keras-applications
google-cloud-spanner==1.13.0 # via apache-beam
google-cloud-videointelligence==1.13.0 # via apache-beam
google-cloud-vision==0.42.0 # via apache-beam
google-pasta==0.2.0 # via tensorflow
google-resumable-media==0.5.1 # via google-cloud-bigquery
googleapis-common-protos[grpc]==1.52.0 # via google-api-core, grpc-google-iam-v1, tensorflow-metadata
grpc-google-iam-v1==0.12.3 # via google-cloud-bigtable, google-cloud-pubsub, google-cloud-spanner
grpcio-gcp==0.2.2 # via apache-beam, google-api-core
grpcio==1.30.0 # via apache-beam, google-api-core, googleapis-common-protos, grpc-google-iam-v1, grpcio-gcp, tensorboard, tensorflow, tensorflow-serving-api, tfx
h5py==2.10.0 # via tensorflow
hdfs==2.5.8 # via apache-beam
httplib2==0.12.0 # via apache-beam, google-api-python-client, google-apitools, google-auth-httplib2, oauth2client
idna==2.9 # via requests
importlib-metadata==1.5.0 # via jsonschema
ipykernel==5.1.4 # via ipywidgets, jupyter, jupyter-console, notebook, qtconsole
httplib2==0.17.4 # via apache-beam, google-api-python-client, google-apitools, google-auth-httplib2, oauth2client
idna==2.10 # via requests
importlib-metadata==1.7.0 # via jsonschema, markdown
ipykernel==5.3.0 # via ipywidgets, jupyter, jupyter-console, notebook, qtconsole
ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets
ipython==7.9.0 # via ipykernel, ipywidgets, jupyter-console, tensorflow-data-validation
ipython==7.9.0 # via ipykernel, ipywidgets, jupyter-console
ipywidgets==7.5.1 # via jupyter, tensorflow-model-analysis
jedi==0.16.0 # via ipython
jinja2==2.11.1 # via nbconvert, notebook, tfx
jedi==0.17.1 # via ipython
jinja2==2.11.2 # via nbconvert, notebook, tfx
joblib==0.14.1 # via scikit-learn, tensorflow-data-validation
jsonschema==3.2.0 # via nbformat
jupyter-client==6.0.0 # via ipykernel, jupyter-console, notebook, qtconsole
jupyter-client==6.1.5 # via ipykernel, jupyter-console, notebook, qtconsole
jupyter-console==6.1.0 # via jupyter
jupyter-core==4.6.3 # via jupyter-client, nbconvert, nbformat, notebook, qtconsole
jupyter==1.0.0 # via tensorflow-model-analysis
keras-applications==1.0.8 # via tensorflow
keras-preprocessing==1.1.0 # via tensorflow
markdown==3.2.1 # via tensorboard
keras-preprocessing==1.1.2 # via tensorflow
keras-tuner==1.0.1 # via tfx
kubernetes==11.0.0 # via tfx
markdown==3.2.2 # via tensorboard
markupsafe==1.1.1 # via jinja2
mistune==0.8.4 # via nbconvert
ml-metadata==0.21.2 # via tfx
ml-metadata==0.22.1 # via tfx
mock==2.0.0 # via apache-beam
monotonic==1.5 # via fasteners
nbconvert==5.6.1 # via jupyter, notebook
nbformat==5.0.4 # via ipywidgets, nbconvert, notebook
nbformat==5.0.7 # via ipywidgets, nbconvert, notebook
notebook==6.0.3 # via jupyter, widgetsnbextension
numpy==1.18.1 # via h5py, keras-applications, keras-preprocessing, opt-einsum, pandas, pyarrow, scikit-learn, scipy, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx-bsl
numpy==1.18.5 # via apache-beam, h5py, keras-preprocessing, keras-tuner, opt-einsum, pandas, pyarrow, scikit-learn, scipy, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx-bsl
oauth2client==3.0.0 # via apache-beam, google-apitools
oauthlib==3.1.0 # via requests-oauthlib
opt-einsum==3.1.0 # via tensorflow
pandas==0.25.3 # via tensorflow-data-validation, tensorflow-model-analysis
opt-einsum==3.2.1 # via tensorflow
packaging==20.4 # via bleach
pandas==0.25.3 # via tensorflow-data-validation, tensorflow-model-analysis, tfx-bsl
pandocfilters==1.4.2 # via nbconvert
parso==0.6.1 # via jedi
pbr==5.4.4 # via mock
parso==0.7.0 # via jedi
pbr==5.4.5 # via mock
pexpect==4.8.0 # via ipython
pickleshare==0.7.5 # via ipython
prometheus-client==0.7.1 # via notebook
prometheus-client==0.8.0 # via notebook
prompt-toolkit==2.0.10 # via ipython, jupyter-console
protobuf==3.11.3 # via apache-beam, google-api-core, google-cloud-bigquery, googleapis-common-protos, ml-metadata, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-metadata, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
protobuf==3.12.2 # via apache-beam, google-api-core, google-cloud-bigquery, googleapis-common-protos, ml-metadata, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-metadata, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
ptyprocess==0.6.0 # via pexpect, terminado
pyarrow==0.15.1 # via apache-beam, tensorflow-data-validation, tensorflow-model-analysis, tfx, tfx-bsl
pyarrow==0.16.0 # via apache-beam, tensorflow-data-validation, tensorflow-model-analysis, tfx, tfx-bsl
pyasn1-modules==0.2.8 # via google-auth, oauth2client
pyasn1==0.4.8 # via oauth2client, pyasn1-modules, rsa
pydot==1.4.1 # via apache-beam, tensorflow-transform
pygments==2.5.2 # via ipython, jupyter-console, nbconvert, qtconsole
pygments==2.6.1 # via ipython, jupyter-console, nbconvert, qtconsole
pymongo==3.10.1 # via apache-beam
pyparsing==2.4.6 # via pydot
pyrsistent==0.15.7 # via jsonschema
python-dateutil==2.8.1 # via apache-beam, jupyter-client, pandas
pytz==2019.3 # via apache-beam, google-api-core, pandas
pyyaml==5.3 # via tfx
pyzmq==19.0.0 # via jupyter-client, notebook
qtconsole==4.6.0 # via jupyter
requests-oauthlib==1.3.0 # via google-auth-oauthlib
requests==2.23.0 # via docker, google-api-core, hdfs, requests-oauthlib, tensorboard
rsa==4.0 # via google-auth, oauth2client
scikit-learn==0.21.3 # via tensorflow-data-validation
scipy==1.4.1 # via scikit-learn, tensorflow, tensorflow-model-analysis
pyparsing==2.4.7 # via packaging, pydot
pyrsistent==0.16.0 # via jsonschema
python-dateutil==2.8.1 # via apache-beam, jupyter-client, kubernetes, pandas
pytz==2020.1 # via apache-beam, fastavro, google-api-core, pandas
pyyaml==5.3.1 # via kubernetes, tfx
pyzmq==19.0.1 # via jupyter-client, notebook, qtconsole
qtconsole==4.7.5 # via jupyter
qtpy==1.9.0 # via qtconsole
requests-oauthlib==1.3.0 # via google-auth-oauthlib, kubernetes
requests==2.24.0 # via docker, google-api-core, hdfs, keras-tuner, kubernetes, requests-oauthlib, tensorboard
rsa==4.6 # via google-auth, oauth2client
scikit-learn==0.22.2.post1 # via keras-tuner
scipy==1.4.1 # via keras-tuner, scikit-learn, tensorflow, tensorflow-model-analysis
send2trash==1.5.0 # via notebook
six==1.14.0 # via absl-py, bleach, docker, fasteners, google-api-core, google-api-python-client, google-apitools, google-auth, google-pasta, google-resumable-media, grpcio, h5py, hdfs, jsonschema, keras-preprocessing, ml-metadata, mock, oauth2client, prompt-toolkit, protobuf, pyarrow, pyrsistent, python-dateutil, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl, traitlets, websocket-client
tensorboard==2.1.0 # via tensorflow
tensorflow-data-validation==0.21.4 # via tfx
tensorflow-estimator==2.1.0 # via tensorflow
tensorflow-metadata==0.21.1 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx-bsl
tensorflow-model-analysis==0.21.5 # via -r requirements.in (line 2), tfx
tensorflow-serving-api==2.1.0 # via tfx, tfx-bsl
tensorflow-transform==0.21.2 # via tensorflow-data-validation, tfx
tensorflow==2.1.0 # via ml-metadata, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
six==1.15.0 # via absl-py, astunparse, bleach, docker, fasteners, google-api-core, google-api-python-client, google-apitools, google-auth, google-cloud-bigquery, google-pasta, google-resumable-media, grpcio, h5py, hdfs, jsonschema, keras-preprocessing, kubernetes, ml-metadata, mock, oauth2client, packaging, prompt-toolkit, protobuf, pyarrow, pyrsistent, python-dateutil, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl, traitlets, websocket-client
tabulate==0.8.7 # via keras-tuner
tensorboard-plugin-wit==1.7.0 # via tensorboard
tensorboard==2.2.2 # via tensorflow
tensorflow-data-validation==0.22.2 # via tfx
tensorflow-estimator==2.2.0 # via tensorflow
tensorflow-metadata==0.22.2 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx-bsl
tensorflow-model-analysis==0.22.2 # via tfx
tensorflow-serving-api==2.2.0 # via tfx, tfx-bsl
tensorflow-transform==0.22.0 # via tensorflow-data-validation, tfx
tensorflow==2.2.0 # via ml-metadata, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
termcolor==1.1.0 # via tensorflow
terminado==0.8.3 # via notebook
terminaltables==3.1.0 # via keras-tuner
testpath==0.4.4 # via nbconvert
tfx-bsl==0.21.3 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx
tfx==0.21.2 # via -r requirements.in (line 1)
tornado==6.0.3 # via ipykernel, jupyter-client, notebook, terminado
tfx-bsl==0.22.1 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx
tfx==0.22.0 # via -r -
tornado==6.0.4 # via ipykernel, jupyter-client, notebook, terminado
tqdm==4.47.0 # via keras-tuner
traitlets==4.3.3 # via ipykernel, ipython, ipywidgets, jupyter-client, jupyter-core, nbconvert, nbformat, notebook, qtconsole
typing-extensions==3.7.4.2 # via apache-beam
typing==3.7.4.1 # via apache-beam
uritemplate==3.0.1 # via google-api-python-client
urllib3==1.25.8 # via requests
wcwidth==0.1.8 # via prompt-toolkit
urllib3==1.25.9 # via kubernetes, requests
wcwidth==0.2.5 # via prompt-toolkit
webencodings==0.5.1 # via bleach
websocket-client==0.57.0 # via docker
werkzeug==1.0.0 # via tensorboard
wheel==0.34.2 # via tensorboard, tensorflow
websocket-client==0.57.0 # via docker, kubernetes
werkzeug==1.0.1 # via tensorboard
wheel==0.34.2 # via astunparse, tensorboard, tensorflow
widgetsnbextension==3.5.1 # via ipywidgets
wrapt==1.12.0 # via tensorflow
wrapt==1.12.1 # via tensorflow
zipp==1.2.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions samples/core/iris/iris.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ def _create_pipeline(
if __name__ == '__main__':
absl.logging.set_verbosity(absl.logging.INFO)
# Make sure the version of TFX image used is consistent with the version of
# TFX SDK. Here we use tfx:0.21.2 image.
# TFX SDK. Here we use tfx:0.22.0 image.
config = kubeflow_dag_runner.KubeflowDagRunnerConfig(
kubeflow_metadata_config=kubeflow_dag_runner.
get_default_kubeflow_metadata_config(),
tfx_image='gcr.io/tfx-oss-public/tfx:0.21.2',
tfx_image='gcr.io/tfx-oss-public/tfx:0.22.0',
)
kfp_runner = kubeflow_dag_runner.KubeflowDagRunner(
output_filename=__file__ + '.yaml', config=config
Expand Down
2 changes: 1 addition & 1 deletion samples/core/parameterized_tfx_oss/parameterized_tfx_oss.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def _create_pipeline(
config = kubeflow_dag_runner.KubeflowDagRunnerConfig(
kubeflow_metadata_config=kubeflow_dag_runner.
get_default_kubeflow_metadata_config(),
tfx_image='gcr.io/tfx-oss-public/tfx:0.21.2',
tfx_image='gcr.io/tfx-oss-public/tfx:0.22.0',
)
kfp_runner = kubeflow_dag_runner.KubeflowDagRunner(
output_filename=__file__ + '.yaml', config=config
Expand Down
4 changes: 2 additions & 2 deletions samples/core/parameterized_tfx_oss/taxi_pipeline_notebook.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"source": [
"!python3 -m pip install pip --upgrade --quiet --user\n",
"!python3 -m pip install kfp --upgrade --quiet --user\n",
"!python3 -m pip install tfx==0.21.2 --quiet --user"
"!python3 -m pip install tfx==0.22.0 --quiet --user"
]
},
{
Expand Down Expand Up @@ -276,7 +276,7 @@
"source": [
"# Specify a TFX docker image. For the full list of tags please see:\n",
"# https://hub.docker.com/r/tensorflow/tfx/tags\n",
"tfx_image = 'gcr.io/tfx-oss-public/tfx:0.21.2'\n",
"tfx_image = 'gcr.io/tfx-oss-public/tfx:0.22.0'\n",
"config = kubeflow_dag_runner.KubeflowDagRunnerConfig(\n",
" kubeflow_metadata_config=kubeflow_dag_runner\n",
" .get_default_kubeflow_metadata_config(),\n",
Expand Down
2 changes: 1 addition & 1 deletion test/sample-test/requirements.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ minio
papermill
fire
yamale
tfx==0.21.2
tfx==0.22.0

# Avoiding conflicts:
# There are incompatible versions in the resolved dependencies:
Expand Down
Loading

0 comments on commit ce51c59

Please sign in to comment.