  -r _requirements_base.txt
  # Pinned TF probability doesn't work with numpy >= 1.24
  numpy>=1.21.0,<1.24.0; python_version < '3.8'
  numpy>=1.22.0,<1.24.0; python_version >= '3.8'
  tensorflow-cpu>=2.7.0,<2.11.0
 
</s> remove # Pinned TF probability doesn't work with numpy >= 1.24
numpy>=1.21.0,<1.24.0; python_version < '3.8'
numpy>=1.22.0,<1.24.0; python_version >= '3.8'
 </s> add  </s> remove # Pinned TF probability doesn't work with numpy >= 1.24
numpy>=1.21.0,<1.24.0; python_version < '3.8'
numpy>=1.22.0,<1.24.0; python_version >= '3.8'
 </s> add  </s> remove # Pinned TF probability doesn't work with numpy >= 1.24
numpy>=1.21.0,<1.24.0; python_version < '3.8'
numpy>=1.22.0,<1.24.0; python_version >= '3.8'
tensorflow-gpu>=2.7.0,<2.11.0
 </s> add # Exclude badly numbered Python2 version of nvidia-ml-py
nvidia-ml-py>=11.525,<300 </s> remove protobuf>= 3.19.0,<3.20.0  # TF has started pulling in incompatible protobuf
# Pinned TF probability doesn't work with numpy >= 1.24
numpy>=1.21.0,<1.24.0; python_version < '3.8'
numpy>=1.22.0,<1.24.0; python_version >= '3.8'
tensorflow-macos>=2.8.0,<2.11.0
tensorflow-deps>=2.8.0,<2.11.0
tensorflow-metal>=0.4.0,<0.7.0
libblas  # Conda only
 </s> add -r _requirements_base.txt
tensorflow-macos>=2.10.0,<2.11.0
tensorflow-deps>=2.10.0,<2.11.0
tensorflow-metal>=0.6.0,<0.7.0 </s> remove numexpr>=2.7.3; python_version < '3.9'  # >=2.8.0 conflicts in Conda
numexpr>=2.8.3; python_version >= '3.9'
opencv-python>=4.6.0.0
pillow>=9.2.0
scikit-learn==1.0.2; python_version < '3.9'  # AMD needs version 1.0.2 and 1.1.0 not available in Python 3.7
scikit-learn>=1.1.0; python_version >= '3.9'
 </s> add numexpr>=2.8.4
numpy>=1.25.0
opencv-python>=4.7.0.0
pillow>=9.4.0
scikit-learn>=1.2.2
tensorflow-cpu>=2.10.0,<2.11.0
  -r _requirements_base.txt
tensorflow-cpu>=2.10.0,<2.11.0
tensorflow-cpu>=2.10.0,<2.11.0
tensorflow-cpu>=2.10.0,<2.11.0
tensorflow-cpu>=2.10.0,<2.11.0
keep replace replace replace replace
 Rebase code (#1326)

* Remove tensorflow_probability requirement

* setup.py - fix progress bars

* requirements.txt: Remove pre python 3.9 packages

* update apple requirements.txt

* update INSTALL.md

* Remove python<3.9 code

* setup.py - fix Windows Installer

* typing: python3.9 compliant

* Update pytest and readthedocs python versions

* typing fixes

* Python Version updates
  - Reduce max version to 3.10
  - Default to 3.10 in installers
  - Remove incompatible 3.11 tests

* Update dependencies

* Downgrade imageio dep for Windows

* typing: merge optional unions and fixes

* Updates
  - min python version 3.10
  - typing to python 3.10 spec
  - remove pre-tf2.10 code
  - Add conda tests

* train: re-enable optimizer saving

* Update dockerfiles

* Update setup.py
  - Apple Conda deps to setup.py
  - Better Cuda + dependency handling

* bugfix: Patch logging to prevent Autograph errors

* Update dockerfiles

* Setup.py - Setup.py - stdout to utf-8

* Add more OSes to github Actions

* suppress mac-os end to end test 
requirements/requirements_cpu.txt