Browse Source

remove Lemma calls that are not ready

tags/1.6.1
Trevor Irons 5 years ago
parent
commit
2c3d0d1b2f
3 changed files with 7 additions and 4 deletions
  1. 1
    1
      akvo/__init__.py
  2. 2
    0
      akvo/gui/akvoGUI.py
  3. 4
    3
      setup.py

+ 1
- 1
akvo/__init__.py View File

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

+ 2
- 0
akvo/gui/akvoGUI.py View File

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

+ 4
- 3
setup.py View File

21
     long_description = fh.read()
21
     long_description = fh.read()
22
 
22
 
23
 setup(name='Akvo',
23
 setup(name='Akvo',
24
-      version='1.0.16',
24
+      version='1.0.19',
25
       description='Surface nuclear magnetic resonance workbench',
25
       description='Surface nuclear magnetic resonance workbench',
26
       long_description=long_description,
26
       long_description=long_description,
27
       long_description_content_type='text/markdown',
27
       long_description_content_type='text/markdown',
50
           'pyqt-distutils',
50
           'pyqt-distutils',
51
           'cmocean'
51
           'cmocean'
52
       ],
52
       ],
53
-      packages=['akvo', 'akvo.tressel', 'akvo.gui'],
53
+      packages=['akvo', 'akvo.tressel', 'akvo.gui','akvo.lemma'],
54
       license=['GPL 4.0'],
54
       license=['GPL 4.0'],
55
       entry_points = {
55
       entry_points = {
56
               'console_scripts': [
56
               'console_scripts': [
66
       # Mechanism to include auxiliary files
66
       # Mechanism to include auxiliary files
67
       include_package_data=True,
67
       include_package_data=True,
68
       package_data={
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
       classifiers=[
72
       classifiers=[
72
         "Programming Language :: Python :: 3",
73
         "Programming Language :: Python :: 3",

Loading…
Cancel
Save