瀏覽代碼

remove Lemma calls that are not ready

tags/1.6.1
Trevor Irons 5 年之前
父節點
當前提交
2c3d0d1b2f
共有 3 個文件被更改,包括 7 次插入4 次删除
  1. 1
    1
      akvo/__init__.py
  2. 2
    0
      akvo/gui/akvoGUI.py
  3. 4
    3
      setup.py

+ 1
- 1
akvo/__init__.py 查看文件

@@ -1 +1 @@
1
-#import akvo.tressel.decay
1
+import akvo.lemma 

+ 2
- 0
akvo/gui/akvoGUI.py 查看文件

@@ -29,6 +29,8 @@ import datetime, time
29 29
 
30 30
 
31 31
 from akvo.tressel import mrsurvey 
32
+#from akvo.lemma import pyLemmaCore  # Looking ahead! 
33
+
32 34
 import pkg_resources  # part of setuptools
33 35
 version = pkg_resources.require("Akvo")[0].version
34 36
 

+ 4
- 3
setup.py 查看文件

@@ -21,7 +21,7 @@ with open("README.md", "r") as fh:
21 21
     long_description = fh.read()
22 22
 
23 23
 setup(name='Akvo',
24
-      version='1.0.16',
24
+      version='1.0.19',
25 25
       description='Surface nuclear magnetic resonance workbench',
26 26
       long_description=long_description,
27 27
       long_description_content_type='text/markdown',
@@ -50,7 +50,7 @@ setup(name='Akvo',
50 50
           'pyqt-distutils',
51 51
           'cmocean'
52 52
       ],
53
-      packages=['akvo', 'akvo.tressel', 'akvo.gui'],
53
+      packages=['akvo', 'akvo.tressel', 'akvo.gui','akvo.lemma'],
54 54
       license=['GPL 4.0'],
55 55
       entry_points = {
56 56
               'console_scripts': [
@@ -66,7 +66,8 @@ setup(name='Akvo',
66 66
       # Mechanism to include auxiliary files
67 67
       include_package_data=True,
68 68
       package_data={
69
-        'akvo.gui': ['*.png']  #All .r files 
69
+        'akvo.gui': ['*.png'],  #All .r files 
70
+        'akvo.lemma': ['pyLemmaCore.so']
70 71
       },
71 72
       classifiers=[
72 73
         "Programming Language :: Python :: 3",

Loading…
取消
儲存