Merge API docs and Python 3.7 drop into master

oemof · Jan 17, 2019 · 7a7f0d5 · 7a7f0d5
2 parents e1a93c4 + be5d58b
commit 7a7f0d5
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 18 deletions.
diff --git a/docs/reference/oemof.tabular.datapackage.rst b/docs/reference/oemof.tabular.datapackage.rst
@@ -0,0 +1,46 @@
+oemof.tabular.datapackage package
+=================================
+
+Submodules
+----------
+
+oemof.tabular.datapackage.aggregation module
+--------------------------------------------
+
+.. automodule:: oemof.tabular.datapackage.aggregation
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+oemof.tabular.datapackage.building module
+-----------------------------------------
+
+.. automodule:: oemof.tabular.datapackage.building
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+oemof.tabular.datapackage.processing module
+-------------------------------------------
+
+.. automodule:: oemof.tabular.datapackage.processing
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+oemof.tabular.datapackage.reading module
+----------------------------------------
+
+.. automodule:: oemof.tabular.datapackage.reading
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: oemof.tabular.datapackage
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/reference/oemof.tabular.tools.rst b/docs/reference/oemof.tabular.tools.rst
@@ -0,0 +1,22 @@
+oemof.tabular.tools package
+===========================
+
+Submodules
+----------
+
+oemof.tabular.tools.geometry module
+-----------------------------------
+
+.. automodule:: oemof.tabular.tools.geometry
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: oemof.tabular.tools
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/setup.py b/setup.py
@@ -71,9 +71,7 @@ def read(*names, **kwargs):
         "oemof==0.2.4.dev0",
         "pandas>=0.22",
         "paramiko",
-        "pyproj==1.9.5.1.dev0"
-        if sys.version_info.major >= 3 and sys.version_info.minor >= 7
-        else "pyproj",
+        "pyproj",
         "pyshp",
         "scipy",
         "shapely",
@@ -84,21 +82,10 @@ def read(*names, **kwargs):
         #   'rst': ['docutils>=0.11'],
         #   ':python_version=="2.6"': ['argparse'],
     },
-    dependency_links=(
-        [
-            (
-                "git+https://git@github.com/gnn/pyproj.git"
-                "@69a26ce46634749f602518a375849999cb5e41e0"
-                "#egg=pyproj-1.9.5.1.dev0"
-            )
-        ]
-        if sys.version_info.major >= 3 and sys.version_info.minor >= 7
-        else []
-    )
-    + [
+    dependency_links=[
         (
             "git+https://git@github.com/oemof/oemof.git"
-            "@features/move-datapackage-reader-into-standalone-package"
+            "@releases/v0_3_0"
             "#egg=oemof-0.2.4.dev0"
         )
     ],

diff --git a/tox.ini b/tox.ini
@@ -159,5 +159,3 @@ ignore_errors = True
 basepython = {env:TOXPYTHON:python3.7}
 ignore_errors = True
 
-
-