Merge branch 'main' into brendt/de-astra-fy

.github/workflows/pytest_ubuntu.yml

@@ -60,7 +60,8 @@ jobs:
           pip install pytest-split
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
-          conda install -c conda-forge svmbir>=0.3.3
+          # svmbir install temporarily disabled due to import errors
+          #conda install -c conda-forge svmbir>=0.3.3
           conda install -c conda-forge astra-toolbox
           conda install -c conda-forge pyyaml
           pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version

docs/source/conf/60-rtd.py

@@ -9,15 +9,20 @@
     print("  rootpath: %s" % rootpath)
     print("  confpath: %s" % confpath)
 
+    html_static_path = []
+
+    # See https://about.readthedocs.com/blog/2024/07/addons-by-default/#how-to-opt-in-to-addons-now
+    html_baseurl = os.environ.get("READTHEDOCS_CANONICAL_URL", "")
+    if "html_context" not in globals():
+        html_context = {}
+    html_context["READTHEDOCS"] = True
+
     import matplotlib
 
     matplotlib.use("agg")
 
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-if on_rtd:
-    html_static_path = []
 else:
+    # Add any paths that contain custom static files (such as style sheets) here,
+    # relative to this directory. They are copied after the builtin static files,
+    # so a file named "default.css" will overwrite the builtin "default.css".
     html_static_path = ["_static"]

scico/numpy/_blockarray.py

@@ -174,9 +174,6 @@ def prop_ba(self):
 def _da_method_wrapper(method_name):
     method = getattr(Array, method_name)
 
-    if method.__name__ is None or method.__qualname__ is None:
-        return method
-
     # Don't try to set attributes that are None. Not clear why some
     # functions/methods (e.g. block_until_ready) have None values
     # for these attributes.