From 578235e880141c8043afef051e86e3bd63fc5a9b Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 11 Jul 2023 17:14:51 -0700 Subject: [PATCH 1/2] FIX: ignore bonus unrelated modules found in py310 walk --- typhos/benchmark/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/typhos/benchmark/utils.py b/typhos/benchmark/utils.py index 72fa51d2..4d79e7c0 100644 --- a/typhos/benchmark/utils.py +++ b/typhos/benchmark/utils.py @@ -167,8 +167,8 @@ def get_submodule_names(module_name): # This attr is missing if there are no submodules return submodule_names - for _, submodule_name, is_pkg in pkgutil.walk_packages(module_path): - if submodule_name != '__main__': + for info, submodule_name, is_pkg in pkgutil.walk_packages(module_path): + if submodule_name != '__main__' and info.path in module_path: full_submodule_name = module_name + '.' + submodule_name submodule_names.append(full_submodule_name) if is_pkg: From 58292d18eb649e1549558cf71140da443cfce72a Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 11 Jul 2023 17:22:46 -0700 Subject: [PATCH 2/2] DOC: pre-release notes --- .../558-fix_py310_benchmark.rst | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 docs/source/upcoming_release_notes/558-fix_py310_benchmark.rst diff --git a/docs/source/upcoming_release_notes/558-fix_py310_benchmark.rst b/docs/source/upcoming_release_notes/558-fix_py310_benchmark.rst new file mode 100644 index 00000000..307d70b8 --- /dev/null +++ b/docs/source/upcoming_release_notes/558-fix_py310_benchmark.rst @@ -0,0 +1,23 @@ +558 fix_py310_benchmark +####################### + +API Changes +----------- +- N/A + +Features +-------- +- N/A + +Bugfixes +-------- +- Fix issues with running the CLI benchmarks in certain + conda installs, particularly python>=3.10. + +Maintenance +----------- +- N/A + +Contributors +------------ +- zllentz