Merge pull request #41 from neurord/packaging-fixes

Packaging fixes contributed by Zbigniew Jędrzejewski-Szmek
nsdf · Jan 8, 2016 · 9621ced · 9621ced
2 parents 2153112 + f12aee1
commit 9621ced
Show file tree

Hide file tree

Showing 14 changed files with 688 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,7 @@
+include LICENSE
+include README.md
+graft benchmark
+graft doc
+graft examples
+graft figures
+graft graphviz
diff --git a/doc/conf.py b/doc/conf.py
@@ -58,12 +58,15 @@ def __getattr__(cls, name):
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
+import sphinx
+sphinx13 = sphinx.__version__.split('.') >= ['1', '3']
+
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.mathjax',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.napoleon',
-    'sphinx.ext.coverage'
+    'sphinx.ext.coverage',
+    'sphinx.ext.napoleon' if sphinx13 else 'sphinxcontrib.napoleon',
 ]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/test/batch_print_stats.sh → nsdf/test/batch_print_stats.sh b/test/batch_print_stats.sh → nsdf/test/batch_print_stats.sh
diff --git a/test/print_stats.py → nsdf/test/print_stats.py b/test/print_stats.py → nsdf/test/print_stats.py
diff --git a/test/profile_nan.py → nsdf/test/profile_nan.py b/test/profile_nan.py → nsdf/test/profile_nan.py
diff --git a/test/profile_write_dialects.py → nsdf/test/profile_write_dialects.py b/test/profile_write_dialects.py → nsdf/test/profile_write_dialects.py
diff --git a/test/test_model.py → nsdf/test/test_model.py b/test/test_model.py → nsdf/test/test_model.py
diff --git a/test/test_nsdfdata.py → nsdf/test/test_nsdfdata.py b/test/test_nsdfdata.py → nsdf/test/test_nsdfdata.py
diff --git a/test/test_nsdfreader.py → nsdf/test/test_nsdfreader.py b/test/test_nsdfreader.py → nsdf/test/test_nsdfreader.py
diff --git a/test/test_nsdfwriter.py → nsdf/test/test_nsdfwriter.py b/test/test_nsdfwriter.py → nsdf/test/test_nsdfwriter.py
diff --git a/test/test_util.py → nsdf/test/test_util.py b/test/test_util.py → nsdf/test/test_util.py
diff --git a/test/util.py → nsdf/test/util.py b/test/util.py → nsdf/test/util.py
diff --git a/setup.py b/setup.py
@@ -15,8 +15,8 @@ def read(fname):
       description=("NSDF (Neuroscience Simulation Data Format)"),
       license="GPL 3",
       keywords="neuroscience simulation format data",
-      url="http://github.com/subhacom/nsdf",
-      packages=['nsdf', 'test'],
+      url="https://github.com/nsdf/nsdf",
+      packages=['nsdf', 'nsdf.test'],
       long_description=read('README.md'),
       classifiers=[
           "Development Status :: 1 - Alpha",