Merge branch 'master' of https://github.com/nick5435/thermo-bridge

nick5435 · Apr 26, 2017 · 88b3935 · 88b3935
2 parents ea0691a + fb96b6e
commit 88b3935
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/ThermoPyle/ThermoPyle.pyx b/ThermoPyle/ThermoPyle.pyx
@@ -325,8 +325,7 @@ class CSVFluid:
             "vars": list(self.vars),
             "numPoints": self.numPoints,
             "colorMap": self.colorMap,
-            "units": self.units
-        })
+            "units": self.units})
 
     @classmethod
     def add_column(self, variables: Union[List[Text], Text]) -> None:

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -24,15 +24,12 @@
 # The full version, including alpha/beta/rc tags.
 release = "0.6.3"
 
-sys.path.insert(0, os.path.abspath("."))
-sys.path.insert(0, os.path.abspath(".."))
+
+sys.path.insert(0, os.path.abspath("../../ThermoPyle/ThermoPyle.pyx"))
 sys.path.insert(0, os.path.abspath("../../ThermoPyle/"))
-sys.path.insert(0, os.path.abspath("/../ThermoPyle/"))
-sys.path.insert(0, os.path.abspath("./ThermoPyle/"))
-sys.path.insert(0, os.path.abspath("../../notebooks/"))
+sys.path.insert(1, os.path.abspath("../../notebooks/"))
+sys.path.insert(1, os.path.abspath("../../plots/"))
 sys.path.insert(0, os.path.abspath("../../"))
-sys.path.insert(0, os.path.abspath("../../plots/"))
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -63,7 +60,7 @@
 
 autodoc_mock_imports = [
     "pyrsistent", "arrow", "matplotlib", "mpl_toolkits", "matplotlib.pyplot",
-    "pandas", "cytoolz", "numpy", "mpl_toolkits.mplot3d", "Cython", "matplotlib.mlab", "matplotlib.cm"
+    "pandas", "cytoolz", "numpy", "mpl_toolkits.mplot3d", "matplotlib.mlab", "matplotlib.cm"
 ]
 
 # Add any paths that contain templates here, relative to this directory.