                  retval = group_frame.sub_frame
  
              group_frame.pack(side=tk.TOP, fill=tk.X, padx=5, pady=5, anchor=tk.NW)
  
              self.group_frames[group] = dict(frame=retval,
                                              chkbtns=self.checkbuttons_frame(retval))
          group_frame = self.group_frames[group]
          return group_frame
  
      def add_scrollbar(self):
          """ Add a scrollbar to the options frame """
 
</s> remove             retval: Optional[tk.Frame] = frame
 </s> add             retval: tk.Frame | None = frame </s> remove         self._display: Optional[PreviewTk] = None
 </s> add         self._display: PreviewTk | None = None </s> remove         self._image_canvas: Optional[ImagesCanvas] = None
        self._opts_book: Optional[OptionsBook] = None
        self._cli_frame: Optional[ActionFrame] = None  # cli frame holds cli options
 </s> add         self._image_canvas: ImagesCanvas | None = None
        self._opts_book: OptionsBook | None = None
        self._cli_frame: ActionFrame | None = None  # cli frame holds cli options </s> remove                 tooltip_kwargs = dict(text=self.option.helptext)
 </s> add                 tooltip_kwargs = {"text": self.option.helptext} </s> remove     def _add_queues(self) -> Dict[str, EventQueue]:
 </s> add     def _add_queues(self) -> dict[str, EventQueue]:
            self.group_frames[group] = {"frame": retval,
                                        "chkbtns": self.checkbuttons_frame(retval)}
                  retval = group_frame.sub_frame
  
              group_frame.pack(side=tk.TOP, fill=tk.X, padx=5, pady=5, anchor=tk.NW)
  
            self.group_frames[group] = {"frame": retval,
                                        "chkbtns": self.checkbuttons_frame(retval)}
            self.group_frames[group] = {"frame": retval,
                                        "chkbtns": self.checkbuttons_frame(retval)}
          group_frame = self.group_frames[group]
          return group_frame
  
      def add_scrollbar(self):
          """ Add a scrollbar to the options frame """
keep keep keep keep 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 
lib/gui/control_helper.py