Merge branch 'devel'

aarpon · Jan 7, 2020 · 8fd862a · 8fd862a
2 parents 2429693 + e67cf98
commit 8fd862a
Show file tree

Hide file tree

Showing 30 changed files with 1,919 additions and 1,187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 /build/
 /dist/
 /.idea/
+/.vscode/
+/pIceImarisConnector.egg-info/
diff --git a/.pydevproject b/.pydevproject
@@ -4,5 +4,5 @@
 <path>/pIceImarisConnector/pIceImarisConnector</path>
 </pydev_pathproperty>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 </pydev_project>
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,9 @@
+version: 2
+sphinx:
+  configuration: docs/conf.py
+formats: 
+  - htmlzip
+python:
+  version: 3
+  install:
+    - requirements: docs/requirements.txt
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
-recursive-include doc/html *
-prune doc/html/.doctrees/
-exclude doc/html/.buildinfo
+recursive-include doc/_build/html *
+exclude doc/_build/html/.buildinfo
+include *.ims *.py
 include LICENSE.txt
 include README.md
diff --git a/build_documentation.bat b/build_documentation.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+cd docs
+make html
diff --git a/build_pip_package.bat b/build_pip_package.bat
@@ -0,0 +1,6 @@
+@ECHO OFF
+if exist build rd /s /q build
+rd /s /q dist
+python setup.py bdist_wheel
+rd /s /q build
+dir dist
diff --git a/doc/conf.py b/doc/conf.py
diff --git a/doc/index.rst b/doc/index.rst
diff --git a/doc/.gitignore → docs/.gitignore b/doc/.gitignore → docs/.gitignore
diff --git a/doc/Makefile → docs/Makefile b/doc/Makefile → docs/Makefile