Merge branch 'master' into enh_device_notes

pcdshub · Jul 12, 2023 · 107fc39 · 107fc39
2 parents bdf24a9 + ee4da32
commit 107fc39
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/docs/source/upcoming_release_notes/558-fix_py310_benchmark.rst 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
diff --git 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: