mirror of
https://github.com/craigerl/aprsd.git
synced 2026-08-19 10:13:44 -04:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e9febbbc52 | |||
| fa9ff7d77f | |||
| 8e0de9c5ac | |||
| 71cd7e0ab5 | |||
| d485f484ec | |||
| f810c02d5d |
@@ -1,9 +1,22 @@
|
|||||||
CHANGES
|
CHANGES
|
||||||
=======
|
=======
|
||||||
|
|
||||||
|
v3.3.3
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fix for sample-config warning
|
||||||
|
|
||||||
|
v3.3.2
|
||||||
|
------
|
||||||
|
|
||||||
|
* Changelog for 3.3.2
|
||||||
|
* Remove warning during sample-config
|
||||||
|
* Removed print in utils
|
||||||
|
|
||||||
v3.3.1
|
v3.3.1
|
||||||
------
|
------
|
||||||
|
|
||||||
|
* Updates for 3.3.1
|
||||||
* Fixed failure with fetch-stats
|
* Fixed failure with fetch-stats
|
||||||
* Fixed problem with list-plugins
|
* Fixed problem with list-plugins
|
||||||
|
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ webchat_opts = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
registry_opts = [
|
registry_opts = [
|
||||||
cfg.StrOpt(
|
cfg.BoolOpt(
|
||||||
"enabled",
|
"enabled",
|
||||||
default=False,
|
default=False,
|
||||||
help="Enable sending aprs registry information. This will let the "
|
help="Enable sending aprs registry information. This will let the "
|
||||||
|
|||||||
+16
-2
@@ -122,10 +122,25 @@ def check_version(ctx):
|
|||||||
def sample_config(ctx):
|
def sample_config(ctx):
|
||||||
"""Generate a sample Config file from aprsd and all installed plugins."""
|
"""Generate a sample Config file from aprsd and all installed plugins."""
|
||||||
|
|
||||||
|
def _get_selected_entry_points():
|
||||||
|
import sys
|
||||||
|
if sys.version_info < (3, 10):
|
||||||
|
all = imp.entry_points()
|
||||||
|
selected = []
|
||||||
|
if "oslo.config.opts" in all:
|
||||||
|
for x in all["oslo.config.opts"]:
|
||||||
|
if x.group == "oslo.config.opts":
|
||||||
|
selected.append(x)
|
||||||
|
else:
|
||||||
|
selected = imp.entry_points(group="oslo.config.opts")
|
||||||
|
|
||||||
|
return selected
|
||||||
|
|
||||||
def get_namespaces():
|
def get_namespaces():
|
||||||
args = []
|
args = []
|
||||||
|
|
||||||
selected = imp.entry_points(group="oslo.config.opts")
|
# selected = imp.entry_points(group="oslo.config.opts")
|
||||||
|
selected = _get_selected_entry_points()
|
||||||
for entry in selected:
|
for entry in selected:
|
||||||
if "aprsd" in entry.name:
|
if "aprsd" in entry.name:
|
||||||
args.append("--namespace")
|
args.append("--namespace")
|
||||||
@@ -145,7 +160,6 @@ def sample_config(ctx):
|
|||||||
if not sys.argv[1:]:
|
if not sys.argv[1:]:
|
||||||
raise SystemExit
|
raise SystemExit
|
||||||
raise
|
raise
|
||||||
LOG.warning(conf.namespace)
|
|
||||||
generator.generate(conf)
|
generator.generate(conf)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ from .ring_buffer import RingBuffer # noqa: F401
|
|||||||
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
|
if sys.version_info.major == 3 and sys.version_info.minor >= 3:
|
||||||
from collections.abc import MutableMapping
|
from collections.abc import MutableMapping
|
||||||
else:
|
else:
|
||||||
from collections import MutableMapping
|
from collections.abc import MutableMapping
|
||||||
|
|
||||||
|
|
||||||
def env(*vars, **kwargs):
|
def env(*vars, **kwargs):
|
||||||
@@ -136,7 +136,6 @@ def parse_delta_str(s):
|
|||||||
|
|
||||||
def load_entry_points(group):
|
def load_entry_points(group):
|
||||||
"""Load all extensions registered to the given entry point group"""
|
"""Load all extensions registered to the given entry point group"""
|
||||||
print(f"Loading extensions for group {group}")
|
|
||||||
try:
|
try:
|
||||||
import importlib_metadata
|
import importlib_metadata
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|||||||
Reference in New Issue
Block a user