diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 8f212785..ce376d4c 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -66,25 +66,19 @@ jobs: python -m pip install numpy>=1.22.0 python -m pip install --upgrade pip build wheel "setuptools<69.3" - - name: Build the package + - name: Build and install package shell: bash -l {0} run: | python -m build --wheel --no-isolation - - - name: Install wheel and dependencies - shell: bash -l {0} - run: | - export TFX_DEPENDENCY_SELECTOR=GIT_MASTER - export USE_BAZEL_VERSION=7.7.0 - python -m pip install "apache-beam[gcp]>=2.53,<3" "pandas>=1.0,<3" "numpy>=1.22.0" - python -m pip install git+https://github.com/tensorflow/metadata.git@master --no-deps - # Bypasses PyPI lack of uncompiled prebuilt wheels over modern setups stably - python -m pip install git+https://github.com/tensorflow/tfx-bsl.git@master --no-deps - python -m pip install "tensorflow>=2.21,<2.22" - python -m pip install "absl-py>=0.9,<2.0.0" "joblib>=1.2.0" "pyarrow>=14" "pyfarmhash>=0.2.2,<0.4" "six>=1.12,<2" "dill" "scipy" "scikit-learn" - python -m pip install "protobuf==6.31.1" --force-reinstall - python -m pip install dist/*.whl --no-deps - python -m pip install pytest + if [ "$(uname)" == "Linux" ]; then + python -m pip install auditwheel + auditwheel repair dist/*.whl -w wheelhouse/ + rm -rf dist/ + mkdir -p dist/ + mv wheelhouse/* dist/ + fi + WHEEL_PATH=$(ls dist/*.whl) + python -m pip install "${WHEEL_PATH}[all,test]" - name: Run tests shell: bash -l {0} @@ -136,4 +130,8 @@ jobs: - name: Upload to PyPI uses: pypa/gh-action-pypi-publish@release/v1.9 with: + user: __token__ + password: ${{ secrets.PYPI_API_TOKEN }} packages_dir: wheels/ + verify-metadata: true + verbose: true diff --git a/README.md b/README.md index 09c8cd73..63f53af7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # TensorFlow Data Validation -[![Python](https://img.shields.io/badge/python%7C3.9%7C3.10%7C3.11-blue)](https://github.com/tensorflow/data-validation) +[![Python](https://img.shields.io/badge/python%7C3.10%7C3.11%7C3.12%7C3.13-blue)](https://github.com/tensorflow/data-validation) [![PyPI](https://badge.fury.io/py/tensorflow-data-validation.svg)](https://badge.fury.io/py/tensorflow-data-validation) [![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://www.tensorflow.org/tfx/data_validation/api_docs/python/tfdv) @@ -172,7 +172,8 @@ other *untested* combinations may also work. tensorflow-data-validation | apache-beam[gcp] | pyarrow | tensorflow | tensorflow-metadata | tensorflow-transform | tfx-bsl ------------------------------------------------------------------------------------- | ---------------- | ------- | ----------------- | ------------------- | -------------------- | ------- -[GitHub master](https://github.com/tensorflow/data-validation/blob/master/RELEASE.md) | 2.65.0 | 10.0.1 | nightly (2.x) | 1.17.1 | n/a | 1.17.1 +[GitHub master](https://github.com/tensorflow/data-validation/blob/master/RELEASE.md) | 2.65.0 | 14.0.0 | nightly (2.x) | 1.22.0.dev | n/a | 1.22.0.dev +[1.21.0](https://github.com/tensorflow/data-validation/blob/v1.21.0/RELEASE.md) | 2.65.0 | 14.0.0 | 2.21 | 1.21.0 | n/a | 1.21.0 [1.17.0](https://github.com/tensorflow/data-validation/blob/v1.17.0/RELEASE.md) | 2.65.0 | 10.0.1 | 2.17 | 1.17.1 | n/a | 1.17.1 [1.16.1](https://github.com/tensorflow/data-validation/blob/v1.16.1/RELEASE.md) | 2.59.0 | 10.0.1 | 2.16 | 1.16.1 | n/a | 1.16.1 [1.16.0](https://github.com/tensorflow/data-validation/blob/v1.16.0/RELEASE.md) | 2.59.0 | 10.0.1 | 2.16 | 1.16.0 | n/a | 1.16.0 diff --git a/RELEASE.md b/RELEASE.md index 1135d914..5762b736 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,23 +4,41 @@ ## Major Features and Improvements -* Upgraded to support TensorFlow 2.21.0. +## Bug Fixes and Other Changes + +## Known Issues + +## Breaking Changes + +## Deprecation + +# Version 1.21.0 + +## Major Features and Improvements + * Added support for Python 3.12 and 3.13. * Dropped support for Python 3.9. ## Bug Fixes and Other Changes -* Aligned Protobuf dependency to `>=6.0.0,<7.0.0`. -* Updated PyArrow dependency to `>=14`. +* Depends on Protobuf to `>=6.0.0,<7.0.0`. +* Depends on Tensorflow to `>=2.21,<2.22`. +* Depends on PyArrow `>=14`. * Fixed C++ test build issues by defining missing `ASSERT_OK` and `EXPECT_OK` macros, replacing `LOG(FATAL)` with `abort()`, and fixing invalid Protobuf includes. * Fixed Python test failures by updating `assertRaisesRegex` to expect `RuntimeError` wrapping `ValueError` in Beam pipelines. ## Known Issues +* N/A + ## Breaking Changes +* N/A + ## Deprecation +* N/A + # Version 1.17.0 ## Major Features and Improvements diff --git a/docs/install.md b/docs/install.md index f4572fe8..afc915f9 100644 --- a/docs/install.md +++ b/docs/install.md @@ -171,7 +171,8 @@ other *untested* combinations may also work. tensorflow-data-validation | apache-beam[gcp] | pyarrow | tensorflow | tensorflow-metadata | tensorflow-transform | tfx-bsl ------------------------------------------------------------------------------------- | ---------------- | ------- | ----------------- | ------------------- | -------------------- | ------- -[GitHub master](https://github.com/tensorflow/data-validation/blob/master/RELEASE.md) | 2.65.0 | 10.0.1 | nightly (1.x/2.x) | 1.17.1 | n/a | 1.17.1 +[GitHub master](https://github.com/tensorflow/data-validation/blob/master/RELEASE.md) | 2.65.0 | 14.0.0 | nightly (1.x/2.x) | 1.22.0.dev | n/a | 1.22.0.dev +[1.21.0](https://github.com/tensorflow/data-validation/blob/v1.21.0/RELEASE.md) | 2.65.0 | 14.0.0 | 2.21 | 1.21.0 | n/a | 1.21.0 [1.17.0](https://github.com/tensorflow/data-validation/blob/v1.17.0/RELEASE.md) | 2.65.0 | 10.0.1 | 2.17 | 1.17.1 | n/a | 1.17.1 [1.16.1](https://github.com/tensorflow/data-validation/blob/v1.16.1/RELEASE.md) | 2.59.0 | 10.0.1 | 2.16 | 1.16.1 | n/a | 1.16.1 [1.16.0](https://github.com/tensorflow/data-validation/blob/v1.16.0/RELEASE.md) | 2.59.0 | 10.0.1 | 2.16 | 1.16.0 | n/a | 1.16.0 diff --git a/setup.py b/setup.py index e40c7a08..18b6bda7 100644 --- a/setup.py +++ b/setup.py @@ -236,14 +236,14 @@ def select_constraint(default, nightly=None, git_master=None): "tensorflow>=2.21,<2.22", "tensorflow-metadata" + select_constraint( - default="@git+https://github.com/tensorflow/metadata@master", - nightly=">=1.18.0.dev", + default=">=1.21.0,<1.22", + nightly=">=1.22.0.dev", git_master="@git+https://github.com/tensorflow/metadata@master", ), "tfx-bsl" + select_constraint( - default="@git+https://github.com/tensorflow/tfx-bsl@master", - nightly=">=1.18.0.dev", + default=">=1.21.0,<1.22", + nightly=">=1.22.0.dev", git_master="@git+https://github.com/tensorflow/tfx-bsl@master", ), ], diff --git a/tensorflow_data_validation/version.py b/tensorflow_data_validation/version.py index 5c68a71d..ba8befdb 100644 --- a/tensorflow_data_validation/version.py +++ b/tensorflow_data_validation/version.py @@ -15,4 +15,4 @@ """Contains the version string of TFDV.""" # Note that setup.py uses this version. -__version__ = "1.18.0.dev" +__version__ = "1.22.0.dev" diff --git a/tensorflow_data_validation/workspace.bzl b/tensorflow_data_validation/workspace.bzl index 794b1bf4..a4c18661 100644 --- a/tensorflow_data_validation/workspace.bzl +++ b/tensorflow_data_validation/workspace.bzl @@ -8,12 +8,12 @@ def tf_data_validation_workspace(): git_repository( name = "com_github_tensorflow_metadata", - branch = "master", + commit = "da17f4557749ae122284c5be3e43a2f211d3e6e2", remote = "https://github.com/tensorflow/metadata.git", ) git_repository( name = "com_github_tfx_bsl", - branch = "master", + commit = "79a4c97cec4ecbad3e95838e990f9b3a0c6439c0", remote = "https://github.com/tensorflow/tfx-bsl.git", )