Merge pull request #71 from Quansight-Labs/fix-docs

Fix docs
metadsl · Jul 11, 2019 · b963910 · b963910
2 parents 871ae68 + 30d400c
commit b963910
Show file tree

Hide file tree

Showing 28 changed files with 86 additions and 58 deletions.
diff --git a/binder/apt.txt b/binder/apt.txt
@@ -0,0 +1 @@
+graphviz
diff --git a/core.pyproject.toml b/core.pyproject.toml
@@ -9,6 +9,7 @@ author-email = "s.shanabrook@gmail.com"
 home-page = "https://github.com/Quansight-Labs/metadsl"
 requires = [
     "metadsl",
+    "numpy"
 ]
 requires-python = ">=3.7"
 classifiers = [

diff --git a/docs/api/conversion.rst b/docs/api/conversion.rst
diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -1,16 +1,10 @@
 API
 ===
 
-.. automodule:: metadsl
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 4
 
-   expressions
-   rules
-   matching
-   python/index
-   numpy/index
-..    wraps
-   conversion
+   metadsl/index
+   metadsl_core/index
 
diff --git a/docs/api/expressions.rst → docs/api/metadsl/expressions.rst b/docs/api/expressions.rst → docs/api/metadsl/expressions.rst
diff --git a/docs/api/metadsl/index.rst b/docs/api/metadsl/index.rst
@@ -0,0 +1,13 @@
+metadsl
+=======
+
+.. automodule:: metadsl
+
+.. toctree::
+   :maxdepth: 3
+
+   expressions
+   rules
+   matching
+
+
diff --git a/docs/api/matching.rst → docs/api/metadsl/matching.rst b/docs/api/matching.rst → docs/api/metadsl/matching.rst
diff --git a/docs/api/rules.rst → docs/api/metadsl/rules.rst b/docs/api/rules.rst → docs/api/metadsl/rules.rst
diff --git a/docs/api/metadsl_core/abstraction.rst b/docs/api/metadsl_core/abstraction.rst
@@ -0,0 +1,4 @@
+metadsl_core.abstraction
+========================
+
+.. automodule:: metadsl_core.abstraction
diff --git a/docs/api/metadsl_core/boolean.rst b/docs/api/metadsl_core/boolean.rst
@@ -0,0 +1,4 @@
+metadsl_core.boolean
+========================
+
+.. automodule:: metadsl_core.boolean
diff --git a/docs/api/metadsl_core/conversion.rst b/docs/api/metadsl_core/conversion.rst
@@ -0,0 +1,4 @@
+metadsl_core.conversion
+========================
+
+.. automodule:: metadsl_core.conversion
diff --git a/docs/api/metadsl_core/either.rst b/docs/api/metadsl_core/either.rst
@@ -0,0 +1,4 @@
+metadsl_core.either
+========================
+
+.. automodule:: metadsl_core.either
diff --git a/docs/api/metadsl_core/index.rst b/docs/api/metadsl_core/index.rst
@@ -0,0 +1,21 @@
+metadsl_core
+============
+
+.. automodule:: metadsl_core
+
+.. toctree::
+   :maxdepth: 3
+
+   abstraction
+   boolean
+   conversion
+   either
+   integer
+   maybe
+   numpy_engine
+   numpy
+   pair
+   vec
+
+
+
diff --git a/docs/api/metadsl_core/integer.rst b/docs/api/metadsl_core/integer.rst
@@ -0,0 +1,4 @@
+metadsl_core.integer
+========================
+
+.. automodule:: metadsl_core.integer
diff --git a/docs/api/metadsl_core/maybe.rst b/docs/api/metadsl_core/maybe.rst
@@ -0,0 +1,4 @@
+metadsl_core.maybe
+========================
+
+.. automodule:: metadsl_core.maybe
diff --git a/docs/api/metadsl_core/numpy.rst b/docs/api/metadsl_core/numpy.rst
@@ -0,0 +1,4 @@
+metadsl_core.numpy
+========================
+
+.. automodule:: metadsl_core.numpy
diff --git a/docs/api/metadsl_core/numpy_engine.rst b/docs/api/metadsl_core/numpy_engine.rst
@@ -0,0 +1,4 @@
+metadsl_core.numpy_engine
+========================
+
+.. automodule:: metadsl_core.numpy_engine
diff --git a/docs/api/metadsl_core/pair.rst b/docs/api/metadsl_core/pair.rst
@@ -0,0 +1,4 @@
+metadsl_core.pair
+========================
+
+.. automodule:: metadsl_core.pair
diff --git a/docs/api/metadsl_core/vec.rst b/docs/api/metadsl_core/vec.rst
@@ -0,0 +1,4 @@
+metadsl_core.vec
+========================
+
+.. automodule:: metadsl_core.vec
diff --git a/docs/api/numpy/expressions.rst b/docs/api/numpy/expressions.rst
diff --git a/docs/api/numpy/index.rst b/docs/api/numpy/index.rst
diff --git a/docs/api/numpy/wraps.rst b/docs/api/numpy/wraps.rst
diff --git a/docs/api/python/expressions.rst b/docs/api/python/expressions.rst
diff --git a/docs/api/python/index.rst b/docs/api/python/index.rst
diff --git a/docs/api/python/wraps.rst b/docs/api/python/wraps.rst
diff --git a/docs/api/wraps.rst b/docs/api/wraps.rst
diff --git a/metadsl/expressions.py b/metadsl/expressions.py
@@ -29,8 +29,8 @@ class Expression(GenericCheck):
 
     Calling the function, after replacing the typevars in it (if it is a bound method),
     with the args and kwargs should resualt in an equivalent expression:
-        
-        replace_fn_typevars(self.function, self.typevars)(*self.args, **self.kwargs) == self
+
+    replace_fn_typevars(self.function, self.typevars)(*self.args, **self.kwargs) == self
     
     The return type of the function, inferred by replacing the typevars in and with these args and kwargs,
     should match the type of the expression. If the return type of the function is not subclass of expression,

diff --git a/metadsl/typing_tools.py b/metadsl/typing_tools.py
@@ -91,7 +91,11 @@ def generic_getattr(self, attr):
     """
     if "__origin__" in self.__dict__ and attr not in ("__wrapped__"):
         # If the attribute is a descriptor, pass in the generic class
-        property = self.__origin__.__getattribute__(self.__origin__, attr)
+        try:
+            property = self.__origin__.__getattribute__(self.__origin__, attr)
+        except:
+            return
+
         if hasattr(property, "__get__"):
             return property.__get__(None, self)
         # Otherwise, just resolve it normally