  import re
  import sys
  from shutil import which
  from subprocess import list2cmdline, PIPE, Popen, run, STDOUT
  from typing import Any, Dict, List, Optional, Set, Tuple, Type
  
  from pkg_resources import parse_requirements, Requirement
  
  from lib.logger import log_setup
  
 
</s> remove from pkg_resources import parse_requirements, Requirement
 </s> add from pkg_resources import parse_requirements </s> remove from typing import Any, Callable, Dict, Generator, List, Tuple, Type, Optional, Set, Union
 </s> add if T.TYPE_CHECKING:
    from collections.abc import Callable, Generator </s> remove from typing import Any, cast, Dict, Generator, List, Optional, Tuple, TYPE_CHECKING, Union
 </s> add from collections.abc import Generator </s> remove from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
 </s> add 
  import re
  import sys
  from shutil import which
  from subprocess import list2cmdline, PIPE, Popen, run, STDOUT

  
  from pkg_resources import parse_requirements, Requirement
  
  from lib.logger import log_setup
  
keep keep keep keep replace keep keep keep keep keep
 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 
setup.py