Browse Source

Python3.9

tags/1.6.1
Trevor Irons 3 years ago
parent
commit
e7868cba03
2 changed files with 6 additions and 4 deletions
  1. 1
    1
      akvo/tressel/logbarrier.py
  2. 5
    3
      setup.py

+ 1
- 1
akvo/tressel/logbarrier.py View File

193
             #mu2 = SIGMA/N * np.abs(np.dot(s2, x))
193
             #mu2 = SIGMA/N * np.abs(np.dot(s2, x))
194
             
194
             
195
             b_pre = np.dot(A, x)
195
             b_pre = np.dot(A, x)
196
-            phid = np.linalg.norm( np.dot(Wd, (b-b_pre)))**2
196
+            phid = np.linalg.norm(np.dot(Wd, (b-b_pre)))**2
197
             phim = np.linalg.norm( np.dot(Phim_base, (x-xr)) )**2
197
             phim = np.linalg.norm( np.dot(Phim_base, (x-xr)) )**2
198
             phib = PhiB(mu1, minVal, x)
198
             phib = PhiB(mu1, minVal, x)
199
             inner += 1
199
             inner += 1

+ 5
- 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.5.1',
24
+      version='1.5.2',
25
       python_requires='>3.7.0', # due to pyLemma
25
       python_requires='>3.7.0', # due to pyLemma
26
       description='Surface nuclear magnetic resonance workbench',
26
       description='Surface nuclear magnetic resonance workbench',
27
       long_description=long_description,
27
       long_description=long_description,
71
           'build_py': custom_build_py,
71
           'build_py': custom_build_py,
72
       },
72
       },
73
       # Mechanism to include auxiliary files
73
       # Mechanism to include auxiliary files
74
-      include_package_data=True,
74
+      # commenting out may be necessary? 
75
+      #include_package_data=True,
75
       package_data={
76
       package_data={
76
         'akvo.gui': ['*.png'], 
77
         'akvo.gui': ['*.png'], 
77
-        'akvo.gui': ['*.ui']
78
+        'akvo.gui': ['*.ui'],
79
+        '': ['*.png'], 
78
       },
80
       },
79
       classifiers=[
81
       classifiers=[
80
         "Programming Language :: Python :: 3",
82
         "Programming Language :: Python :: 3",

Loading…
Cancel
Save