          proc = pexpect.spawn(" ".join(self._command),
                               encoding=self._env.encoding, codec_errors="replace", timeout=None)
          while True:
              try:
                  idx = proc.expect(["\r\n", "\r"])
                  line = proc.before.rstrip()
                  if line and idx == 0:
                      if self._last_line_cr:
                          self._last_line_cr = False
                          # Output last line of progress bar and go to next line
                          self._non_gui_print(line)
                      self._seen_line_log(line)
                  elif line and idx == 1:
                      self._last_line_cr = True
                      logger.debug(line)
                      self._non_gui_print(line, end="\r")
              except pexpect.EOF:
                  break
          proc.close()
          return proc.exitstatus
  
 
</s> remove         proc = pexpect.spawn(" ".join(self._command),
                             encoding=self._env.encoding, codec_errors="replace", timeout=None)
 </s> add         proc = pexpect.spawn(" ".join(self._command), timeout=None) </s> remove                 is_cr = line.startswith("\r")
                line = line.rstrip()

                if line and not is_cr:
                    if self._last_line_cr:
                        self._last_line_cr = False
                        # Go to next line
                        self._non_gui_print("")
                    self._seen_line_log(line)
                elif line:
                    self._last_line_cr = True
                    logger.debug(line)
                    self._non_gui_print("", end="\r")
 </s> add                 for line in lines.split(b"\r"):
                    self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                    self._non_gui_print(line)
 </s> remove     def _parse_lines(self) -> None:
        """ Process the latest batch of lines that have been received from winPTY. """
        for line in self._lines:  # Dump the output to log
            line = line.rstrip()
            is_cr = bool(self._pbar.search(line))
            if line and not is_cr:
                if self._last_line_cr:
                    self._last_line_cr = False
                    if not self._env.is_installer:
                        # Go to next line
                        self._non_gui_print("")
                self._seen_line_log(line)
            elif line:
                self._last_line_cr = True
                logger.debug(line)
                # NSIS only updates on line endings, so force new line for installer
                self._non_gui_print(line, end=None if self._env.is_installer else "\r")
        self._lines = []

 </s> add  </s> remove                 if line == "" and returncode is not None:
 </s> add                 if lines == b"" and returncode is not None: </s> remove                     line = proc.stdout.readline().decode(self._env.encoding, errors="replace")
 </s> add                     lines = proc.stdout.readline()
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
          proc = pexpect.spawn(" ".join(self._command),
                               encoding=self._env.encoding, codec_errors="replace", timeout=None)
          while True:
              try:
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
                proc.expect([b"\r\n", b"\r"])
                line: bytes = proc.before
                self._seen_line_log(line.decode("utf-8", errors="replace").rstrip())
                self._non_gui_print(line)
              except pexpect.EOF:
                  break
          proc.close()
          return proc.exitstatus
  
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace 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