Pin tensorflow<2.20.0.

PiperOrigin-RevId: 795403112

Author: fineguy

.github/actions/setup/action.yml

@@ -2,10 +2,6 @@ name: 'Setup'
 description: 'Common setup for workflows.'
 
 inputs:
-  tf-version:
-    description: 'Tensorflow version'
-    required: false
-    default: 'skip'  # Use sentinel value to skip Tensorflow installation
   python-version:
     description: 'Python version'
     required: false
@@ -67,9 +63,6 @@ runs:
     - if: ${{ steps.python-cache.outputs.cache-hit != 'true' }}
       run: pip install .[${{ inputs.extras }}]
       shell: bash
-    - if: ${{ inputs.tf-version != 'skip' }}
-      run: pip install ${{ inputs.tf-version }}
-      shell: bash
     # Get TFDS library from the repository instead of cache.
     - run: echo "PYTHONPATH=$(pwd)" >> $GITHUB_ENV
       shell: bash

.github/workflows/pytest-optional.yml

@@ -44,5 +44,5 @@ jobs:
     name: 'Core TFDS tests'
     uses: ./.github/workflows/pytest-template.yml
     with:
-      tf-version: ${{ matrix.tf-version }}
       os-version: ${{ matrix.os-version }}
+      extras: tests-all,${{ matrix.tf-version }}

.github/workflows/pytest-template.yml

@@ -4,9 +4,10 @@ on:
       os-version:
         required: true
         type: string
-      tf-version:
-        required: true
+      extras:
+        required: false
         type: string
+        default: 'tests-all'
 
 env:
   PYTEST_NUM_SHARDS: 4  # Controls tests sharding enabled by `pytest-shard`
@@ -47,8 +48,8 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/setup
       with:
-        tf-version: ${{ inputs.tf-version }}
         python-version: ${{ matrix.python-version }}
+        extras: ${{ inputs.extras }}
 
     # Run tests
     # Ignores:

.github/workflows/pytest.yml

@@ -49,8 +49,8 @@ jobs:
     name: 'Core TFDS tests'
     uses: ./.github/workflows/pytest-template.yml
     with:
-      tf-version: tensorflow
       os-version: ubuntu-22.04
+      extras: tests-all,tensorflow
 
   huggingface-pytest-job:
     needs: activate-tests
@@ -66,9 +66,8 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/setup
       with:
-        tf-version: tensorflow
         python-version: '3.10'
-        extras: huggingface
+        extras: huggingface,tensorflow
 
     - name: Run HuggingFace tests
       run: |
@@ -88,7 +87,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/setup
       with:
-        tf-version: tensorflow
+        extras: tests-all,tensorflow
 
     - name: Run Github API tests
       run: pytest --durations=100 -vv -n auto tensorflow_datasets/core/github_api/github_path_test.py
@@ -107,7 +106,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/setup
       with:
-        tf-version: tensorflow
+        extras: tests-all,tensorflow
         use-cache: false
 
     # Test each notebook sequentially.

setup.py

@@ -217,7 +217,7 @@
 
 EXTRAS = {
     'matplotlib': ['matplotlib'],
-    'tensorflow': ['tensorflow>=2.1'],
+    'tensorflow': ['tensorflow>=2.1,<2.20.0'],
     'tf-nightly': ['tf-nightly'],
     'tensorflow-data-validation': ['tensorflow-data-validation'],
     'tests-all': TESTS_ALL_DEPENDENCIES,