                  category = section.split(".")[0]
                  sect = section.split(".")[-1]
                  # Elevate global to root
                  key = plugin if sect == "global" else f"{plugin}|{category}|{sect}"
                  retval[key] = dict(helptext=None, options=OrderedDict())
  
                  retval[key]["helptext"] = conf.defaults[section].helptext
                  for option, params in conf.defaults[section].items.items():
                      initial_value = conf.config_dict[option]
                      initial_value = "none" if initial_value is None else initial_value
 
</s> remove         retval: Dict[str, ConfigValueType] = {}
 </s> add         retval: dict[str, ConfigValueType] = {} </s> remove         conf: Dict[str, ConfigValueType] = {}
 </s> add         conf: dict[str, ConfigValueType] = {} </s> remove                 channel = None if mapping[1] == "" else mapping[1]
 </s> add                 channel = "" if mapping[1] is None else mapping[1] </s> remove         self._graph: Optional[SessionGraph] = None
        self._display_data: Optional[Calculations] = None
 </s> add         self._graph: SessionGraph | None = None
        self._display_data: Calculations | None = None </s> remove         key = cast(TriggerKeysType, keypress)
 </s> add         key = T.cast(TriggerKeysType, keypress)
                retval[key] = {"helptext": None, "options": OrderedDict()}
                  category = section.split(".")[0]
                  sect = section.split(".")[-1]
                  # Elevate global to root
                  key = plugin if sect == "global" else f"{plugin}|{category}|{sect}"
                retval[key] = {"helptext": None, "options": OrderedDict()}
  
                  retval[key]["helptext"] = conf.defaults[section].helptext
                  for option, params in conf.defaults[section].items.items():
                      initial_value = conf.config_dict[option]
                      initial_value = "none" if initial_value is None else initial_value
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 
lib/gui/popup_configure.py