Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-traitlets for
openSUSE:Factory checked in at 2023-02-04 14:11:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-traitlets (Old)
and /work/SRC/openSUSE:Factory/.python-traitlets.new.4462 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-traitlets"
Sat Feb 4 14:11:09 2023 rev:16 rq:1063000 version:5.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-traitlets/python-traitlets.changes
2023-01-17 17:34:51.609023188 +0100
+++
/work/SRC/openSUSE:Factory/.python-traitlets.new.4462/python-traitlets.changes
2023-02-04 14:29:49.174524351 +0100
@@ -1,0 +2,6 @@
+Thu Feb 2 16:51:20 UTC 2023 - Ben Greiner <[email protected]>
+
+- Update to 5.9.0
+ * Polishing argcomplete support #829 (@azjps)
+
+-------------------------------------------------------------------
Old:
----
traitlets-5.8.1.tar.gz
New:
----
traitlets-5.9.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-traitlets.spec ++++++
--- /var/tmp/diff_new_pack.2SobpR/_old 2023-02-04 14:29:49.502526382 +0100
+++ /var/tmp/diff_new_pack.2SobpR/_new 2023-02-04 14:29:49.510526432 +0100
@@ -17,7 +17,7 @@
Name: python-traitlets
-Version: 5.8.1
+Version: 5.9.0
Release: 0
Summary: Traitlets Python configuration system
License: BSD-3-Clause
++++++ traitlets-5.8.1.tar.gz -> traitlets-5.9.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/traitlets-5.8.1/CHANGELOG.md
new/traitlets-5.9.0/CHANGELOG.md
--- old/traitlets-5.8.1/CHANGELOG.md 2020-02-02 01:00:00.000000000 +0100
+++ new/traitlets-5.9.0/CHANGELOG.md 2020-02-02 01:00:00.000000000 +0100
@@ -2,6 +2,26 @@
<!-- <START NEW CHANGELOG ENTRY> -->
+## 5.9.0
+
+([Full
Changelog](https://github.com/ipython/traitlets/compare/v5.8.1...c11a4d942b08df5c19be88b6cc81dfa8302fef9b))
+
+### Enhancements made
+
+- Polishing argcomplete support
[#829](https://github.com/ipython/traitlets/pull/829)
([@azjps](https://github.com/azjps))
+
+### Maintenance and upkeep improvements
+
+- Test that name and description can be set via constructor.
[#826](https://github.com/ipython/traitlets/pull/826)
([@Carreau](https://github.com/Carreau))
+
+### Contributors to this release
+
+([GitHub contributors page for this
release](https://github.com/ipython/traitlets/graphs/contributors?from=2023-01-09&to=2023-01-30&type=c))
+
+[@azjps](https://github.com/search?q=repo%3Aipython%2Ftraitlets+involves%3Aazjps+updated%3A2023-01-09..2023-01-30&type=Issues)
|
[@blink1073](https://github.com/search?q=repo%3Aipython%2Ftraitlets+involves%3Ablink1073+updated%3A2023-01-09..2023-01-30&type=Issues)
|
[@Carreau](https://github.com/search?q=repo%3Aipython%2Ftraitlets+involves%3ACarreau+updated%3A2023-01-09..2023-01-30&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
## 5.8.1
([Full
Changelog](https://github.com/ipython/traitlets/compare/v5.8.0...18814204c7e7987851cc1836a36863b4fab60165))
@@ -22,8 +42,6 @@
[@blink1073](https://github.com/search?q=repo%3Aipython%2Ftraitlets+involves%3Ablink1073+updated%3A2022-12-19..2023-01-09&type=Issues)
|
[@maartenbreddels](https://github.com/search?q=repo%3Aipython%2Ftraitlets+involves%3Amaartenbreddels+updated%3A2022-12-19..2023-01-09&type=Issues)
|
[@pre-commit-ci](https://github.com/search?q=repo%3Aipython%2Ftraitlets+involves%3Apre-commit-ci+updated%3A2022-12-19..2023-01-09&type=Issues)
|
[@rmorshea](https://github.com/search?q=repo%3Aipython%2Ftraitlets+involves%3Armorshea+updated%3A2022-12-19..2023-01-09&type=Issues)
-<!-- <END NEW CHANGELOG ENTRY> -->
-
## 5.8.0
([Full
Changelog](https://github.com/ipython/traitlets/compare/v5.7.1...47e652f96aff54d1aa3b19337c9c8d80fe0fd4c4))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/traitlets-5.8.1/PKG-INFO new/traitlets-5.9.0/PKG-INFO
--- old/traitlets-5.8.1/PKG-INFO 2020-02-02 01:00:00.000000000 +0100
+++ new/traitlets-5.9.0/PKG-INFO 2020-02-02 01:00:00.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: traitlets
-Version: 5.8.1
+Version: 5.9.0
Summary: Traitlets Python configuration system
Project-URL: Homepage, https://github.com/ipython/traitlets
Author-email: IPython Development Team <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/traitlets-5.8.1/traitlets/_version.py
new/traitlets-5.9.0/traitlets/_version.py
--- old/traitlets-5.8.1/traitlets/_version.py 2020-02-02 01:00:00.000000000
+0100
+++ new/traitlets-5.9.0/traitlets/_version.py 2020-02-02 01:00:00.000000000
+0100
@@ -5,7 +5,7 @@
from typing import List
# Version string must appear intact for hatch versioning
-__version__ = "5.8.1"
+__version__ = "5.9.0"
# Build up version_info tuple for backwards compatibility
pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/traitlets-5.8.1/traitlets/config/application.py
new/traitlets-5.9.0/traitlets/config/application.py
--- old/traitlets-5.8.1/traitlets/config/application.py 2020-02-02
01:00:00.000000000 +0100
+++ new/traitlets-5.9.0/traitlets/config/application.py 2020-02-02
01:00:00.000000000 +0100
@@ -731,7 +731,7 @@
This prevents issues such as an alias pointing to InteractiveShell,
but a config file setting the same trait in TerminalInteraciveShell
getting inappropriate priority over the command-line arg.
- Also, loaders expect ``(key: longname)`` and not ````key: (longname,
help)`` items.
+ Also, loaders expect ``(key: longname)`` and not ``key: (longname,
help)`` items.
Only aliases with exactly one descendent in the class list
will be promoted.
@@ -785,7 +785,9 @@
return flags, aliases
def _create_loader(self, argv, aliases, flags, classes):
- return KVArgParseConfigLoader(argv, aliases, flags, classes=classes,
log=self.log)
+ return KVArgParseConfigLoader(
+ argv, aliases, flags, classes=classes, log=self.log,
subcommands=self.subcommands
+ )
@classmethod
def _get_sys_argv(cls, check_argcomplete: bool = False) -> t.List[str]:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/traitlets-5.8.1/traitlets/config/argcomplete_config.py
new/traitlets-5.9.0/traitlets/config/argcomplete_config.py
--- old/traitlets-5.8.1/traitlets/config/argcomplete_config.py 2020-02-02
01:00:00.000000000 +0100
+++ new/traitlets-5.9.0/traitlets/config/argcomplete_config.py 2020-02-02
01:00:00.000000000 +0100
@@ -1,4 +1,9 @@
"""Helper utilities for integrating argcomplete with traitlets"""
+
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+
import argparse
import os
import typing as t
@@ -76,23 +81,25 @@
class ExtendedCompletionFinder(CompletionFinder):
"""An extension of CompletionFinder which dynamically completes
class-trait based options
- This finder mainly adds 2 functionalities:
+ This finder adds a few functionalities:
- 1. When completing options, it will add --Class. to the list of
completions, for each
- class in Application.classes that could complete the current option.
- 2. If it detects that we are currently trying to complete an option
related to --Class.,
- it will add the corresponding config traits of Class to the ArgumentParser
instance,
+ 1. When completing options, it will add ``--Class.`` to the list of
completions, for each
+ class in `Application.classes` that could complete the current option.
+ 2. If it detects that we are currently trying to complete an option
related to ``--Class.``,
+ it will add the corresponding config traits of Class to the
`ArgumentParser` instance,
so that the traits' completers can be used.
+ 3. If there are any subcommands, they are added as completions for the
first word
- Note that we are avoiding adding all config traits of all classes to the
ArgumentParser,
+ Note that we are avoiding adding all config traits of all classes to the
`ArgumentParser`,
which would be easier but would add more runtime overhead and would also
make completions
appear more spammy.
- These changes do require using the internals of
argcomplete.CompletionFinder.
+ These changes do require using the internals of
`argcomplete.CompletionFinder`.
"""
_parser: argparse.ArgumentParser
- config_classes: t.List[t.Any] # Configurables
+ config_classes: t.List[t.Any] = [] # Configurables
+ subcommands: t.List[str] = []
def match_class_completions(self, cword_prefix: str) ->
t.List[t.Tuple[t.Any, str]]:
"""Match the word to be completed against our Configurable classes
@@ -182,6 +189,16 @@
completions: t.List[str]
completions = super()._get_completions(comp_words, cword_prefix, *args)
+
+ # For subcommand-handling: it is difficult to get this to work
+ # using argparse subparsers, because the ArgumentParser accepts
+ # arbitrary extra_args, which ends up masking subparsers.
+ # Instead, check if comp_words only consists of the script,
+ # if so check if any subcommands start with cword_prefix.
+ if self.subcommands and len(comp_words) == 1:
+ argcomplete.debug("Adding subcommands for", cword_prefix)
+ completions.extend(subc for subc in self.subcommands if
subc.startswith(cword_prefix))
+
return completions
def _get_option_completions(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/traitlets-5.8.1/traitlets/config/loader.py
new/traitlets-5.9.0/traitlets/config/loader.py
--- old/traitlets-5.8.1/traitlets/config/loader.py 2020-02-02
01:00:00.000000000 +0100
+++ new/traitlets-5.9.0/traitlets/config/loader.py 2020-02-02
01:00:00.000000000 +0100
@@ -784,11 +784,15 @@
return super().parse_known_args(args, namespace)
+# type aliases
+Flags = t.Union[str, t.Tuple[str, ...]]
+SubcommandsDict = t.Dict[str, t.Any]
+
+
class ArgParseConfigLoader(CommandLineConfigLoader):
"""A loader that uses the argparse module to load from the command line."""
parser_class = ArgumentParser
- Flags = t.Union[str, t.Tuple[str, ...]]
def __init__(
self,
@@ -797,6 +801,7 @@
flags: t.Optional[t.Dict[Flags, str]] = None,
log: t.Any = None,
classes: t.Optional[t.List[t.Type[t.Any]]] = None,
+ subcommands: t.Optional[SubcommandsDict] = None,
*parser_args: t.Any,
**parser_kw: t.Any,
) -> None:
@@ -837,6 +842,7 @@
self.aliases = aliases or {}
self.flags = flags or {}
self.classes = classes
+ self.subcommands = subcommands # only used for argcomplete currently
self.parser_args = parser_args
self.version = parser_kw.pop("version", None)
@@ -874,6 +880,7 @@
if classes is not None:
self.classes = classes
self._create_parser()
+ self._argcomplete(self.classes, self.subcommands)
self._parse_args(argv)
self._convert_to_config()
return self.config
@@ -893,6 +900,12 @@
def _add_arguments(self, aliases, flags, classes):
raise NotImplementedError("subclasses must implement _add_arguments")
+ def _argcomplete(
+ self, classes: t.List[t.Any], subcommands: t.Optional[SubcommandsDict]
+ ) -> None:
+ """If argcomplete is enabled, allow triggering command-line
autocompletion"""
+ pass
+
def _parse_args(self, args):
"""self.parser->self.parsed_data"""
uargs = [cast_unicode(a) for a in args]
@@ -1047,7 +1060,6 @@
if argcompleter is not None:
# argcomplete's completers are callables returning list of
completion strings
action.completer = functools.partial(argcompleter,
key=key) # type: ignore
- self.argcomplete(classes)
def _convert_to_config(self):
"""self.parsed_data->self.config, parse unrecognized extra args via
KVLoader."""
@@ -1097,7 +1109,10 @@
"""
self.log.warning("Unrecognized alias: '%s', it will have no effect.",
arg)
- def argcomplete(self, classes: t.List[t.Any]) -> None:
+ def _argcomplete(
+ self, classes: t.List[t.Any], subcommands: t.Optional[SubcommandsDict]
+ ) -> None:
+ """If argcomplete is enabled, allow triggering command-line
autocompletion"""
try:
import argcomplete # type: ignore[import] # noqa
except ImportError:
@@ -1107,6 +1122,7 @@
finder = argcomplete_config.ExtendedCompletionFinder()
finder.config_classes = classes
+ finder.subcommands = list(subcommands or [])
# for ease of testing, pass through self._argcomplete_kwargs if set
finder(self.parser, **getattr(self, "_argcomplete_kwargs", {}))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/traitlets-5.8.1/traitlets/config/tests/test_application.py
new/traitlets-5.9.0/traitlets/config/tests/test_application.py
--- old/traitlets-5.8.1/traitlets/config/tests/test_application.py
2020-02-02 01:00:00.000000000 +0100
+++ new/traitlets-5.9.0/traitlets/config/tests/test_application.py
2020-02-02 01:00:00.000000000 +0100
@@ -137,6 +137,10 @@
self.assertEqual(app.classes, [MyApp, Bar, Foo]) # type:ignore
self.assertEqual(app.config_file, "")
+ def test_app_name_set_via_constructor(self):
+ app = MyApp(name='set_via_constructor')
+ assert app.name == "set_via_constructor"
+
def test_mro_discovery(self):
app = MyApp()
@@ -633,6 +637,9 @@
self.assertIs(app.subapp.parent, app)
self.assertIs(app.subapp.subapp.parent, app.subapp) # Set by factory.
+ Root.clear_instance()
+ Sub1.clear_instance()
+
def test_loaded_config_files(self):
app = MyApp()
app.log = logging.getLogger()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/traitlets-5.8.1/traitlets/config/tests/test_argcomplete.py
new/traitlets-5.9.0/traitlets/config/tests/test_argcomplete.py
--- old/traitlets-5.8.1/traitlets/config/tests/test_argcomplete.py
2020-02-02 01:00:00.000000000 +0100
+++ new/traitlets-5.9.0/traitlets/config/tests/test_argcomplete.py
2020-02-02 01:00:00.000000000 +0100
@@ -2,6 +2,9 @@
Tests for argcomplete handling by traitlets.config.application.Application
"""
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
import io
import os
import typing as t
@@ -21,8 +24,19 @@
argcomplete_kwargs: t.Dict[str, t.Any]
+ def __init__(self, *args, **kwargs):
+ # For subcommands, inherit argcomplete_kwargs from parent app
+ parent = kwargs.get("parent")
+ super().__init__(*args, **kwargs)
+ if parent:
+ argcomplete_kwargs = getattr(parent, "argcomplete_kwargs", None)
+ if argcomplete_kwargs:
+ self.argcomplete_kwargs = argcomplete_kwargs
+
def _create_loader(self, argv, aliases, flags, classes):
- loader = KVArgParseConfigLoader(argv, aliases, flags, classes=classes,
log=self.log)
+ loader = KVArgParseConfigLoader(
+ argv, aliases, flags, classes=classes, log=self.log,
subcommands=self.subcommands
+ )
loader._argcomplete_kwargs = self.argcomplete_kwargs # type:
ignore[attr-defined]
return loader
@@ -169,24 +183,34 @@
assert completions == ["--val=foo", "--val=bar"] or completions ==
["foo", "bar"]
assert self.run_completer(app, "app --val --log-level=", point=10) ==
["foo", "bar"]
- # TODO: don't have easy way of testing subcommands yet, since we want
- # to inject _argcomplete_kwargs to subapp. Could use mocking for this
- # def test_complete_subcommands_subapp1(self, argcomplete_on):
- # # subcommand handling modifies _ARGCOMPLETE env var global state, so
- # # only can test one completion per unit test
- # app = MainApp()
- # assert set(self.run_completer(app, "app subapp1 --Sub")) > {
- # '--SubApp1.show_config',
- # '--SubApp1.log_level',
- # '--SubApp1.log_format',
- # }
- #
- # def test_complete_subcommands_subapp2(self, argcomplete_on):
- # app = MainApp()
- # assert set(self.run_completer(app, "app subapp2 --")) > {
- # '--Application.',
- # '--SubApp2.',
- # }
+ def test_complete_subcommands(self, argcomplete_on):
+ app = MainApp()
+ assert set(self.run_completer(app, "app ")) >= {"subapp1", "subapp2"}
+ assert set(self.run_completer(app, "app sub")) == {"subapp1",
"subapp2"}
+ assert set(self.run_completer(app, "app subapp1")) == {"subapp1"}
+
+ def test_complete_subcommands_subapp1(self, argcomplete_on):
+ # subcommand handling modifies _ARGCOMPLETE env var global state, so
+ # only can test one completion per unit test
+ app = MainApp()
+ try:
+ assert set(self.run_completer(app, "app subapp1 --Sub")) > {
+ '--SubApp1.show_config',
+ '--SubApp1.log_level',
+ '--SubApp1.log_format',
+ }
+ finally:
+ SubApp1.clear_instance()
+
+ def test_complete_subcommands_subapp2(self, argcomplete_on):
+ app = MainApp()
+ try:
+ assert set(self.run_completer(app, "app subapp2 --")) > {
+ '--Application.',
+ '--SubApp2.',
+ }
+ finally:
+ SubApp2.clear_instance()
def test_complete_subcommands_main(self, argcomplete_on):
app = MainApp()
