Merge pull request NSLS-II-LIX#3 from hhslepicka/master

New Version of the LIXDC with Sample Manager and HPLC Data Collection
tacaswell · Oct 27, 2016 · 2067e39 · 2067e39
2 parents 4712a08 + 754a009
commit 2067e39
Show file tree

Hide file tree

Showing 28 changed files with 3,784 additions and 258 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+lixdc/_version.py export-subst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+include versioneer.py
+include lixdc/_version.py
diff --git a/launch b/launch
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+from lixdc import gui
+
+if __name__ == "__main__":
+    gui.run()
diff --git a/lixdc/12cells.png b/lixdc/12cells.png
diff --git a/lixdc/96wp.png b/lixdc/96wp.png
diff --git a/lixdc/__init__.py b/lixdc/__init__.py
@@ -0,0 +1,4 @@
+
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		include versioneer.py
		include lixdc/_version.py