Merge pull request #154 from Neuroinflab/endpy2supp

m-kowalska · web-flow · commit c1d45e66cff9 · 2023-12-21T14:23:58.000+01:00
ending support for py2
diff --git a/figures/kCSD_properties/figure_error_3x3.py b/figures/kCSD_properties/figure_error_3x3.py
@@ -2,12 +2,6 @@
 @author: mkowalska
 """
 
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
-
 import os
 import numpy as np
 from figure_properties import *
diff --git a/figures/kCSD_properties/kCSD_with_reliability_map_2D.py b/figures/kCSD_properties/kCSD_with_reliability_map_2D.py
@@ -1,10 +1,6 @@
 """
 @author: mkowalska
 """
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-from __future__ import absolute_import
 
 from builtins import range
 
diff --git a/figures/kCSD_properties/reliability_map_2D.py b/figures/kCSD_properties/reliability_map_2D.py
@@ -1,7 +1,3 @@
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-from __future__ import absolute_import
 
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/figures/kCSD_properties/reliability_map_3x3.py b/figures/kCSD_properties/reliability_map_3x3.py
@@ -1,11 +1,6 @@
 """
 @author: mkowalska
 """
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
 from builtins import range
 
 import numpy as np
diff --git a/figures/kCSD_properties/skcsd_and_l_curve_complex_morphology.py b/figures/kCSD_properties/skcsd_and_l_curve_complex_morphology.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
 import os
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/figures/sKCSD_paper/make_fig_10.py b/figures/sKCSD_paper/make_fig_10.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import run_LFP
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/figures/sKCSD_paper/make_fig_2.py b/figures/sKCSD_paper/make_fig_2.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import sys
 import os
 from distutils.spawn import find_executable, spawn
diff --git a/figures/sKCSD_paper/make_fig_3.py b/figures/sKCSD_paper/make_fig_3.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import sys
diff --git a/figures/sKCSD_paper/make_fig_5.py b/figures/sKCSD_paper/make_fig_5.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import sys
diff --git a/figures/sKCSD_paper/make_fig_6.py b/figures/sKCSD_paper/make_fig_6.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import sys
diff --git a/figures/sKCSD_paper/make_fig_7.py b/figures/sKCSD_paper/make_fig_7.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import sys
diff --git a/figures/sKCSD_paper/make_fig_8.py b/figures/sKCSD_paper/make_fig_8.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import sys
diff --git a/figures/sKCSD_paper/make_fig_9.py b/figures/sKCSD_paper/make_fig_9.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import run_LFP
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/figures/sKCSD_paper/run_LFP.py b/figures/sKCSD_paper/run_LFP.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 import numpy as np
 import sys
 import os
diff --git a/figures/sKCSD_paper/sKCSD_utils.py b/figures/sKCSD_paper/sKCSD_utils.py
@@ -1,4 +1,3 @@
-from __future__ import division
 import numpy as np
 import os
 import sys
diff --git a/kcsd/KCSD.py b/kcsd/KCSD.py
@@ -2,7 +2,6 @@
 kCSD method Jan et.al (2012).
 
 """
-from __future__ import division, print_function, absolute_import
 
 import numpy as np
 from numpy.linalg import LinAlgError, svd
diff --git a/kcsd/basis_functions.py b/kcsd/basis_functions.py
@@ -5,7 +5,6 @@
 Two 'types' are described here, gaussian and step source,
 These can be easily extended.
 """
-from __future__ import division, print_function, absolute_import
 import numpy as np
 
 
diff --git a/kcsd/sKCSD.py b/kcsd/sKCSD.py
@@ -9,7 +9,6 @@
 [1] Laboratory of Neuroinformatics, Nencki Institute of Experimental Biology, Warsaw, Poland [2] Google Summer of Code 2014, INCF/pykCSD [3] University of Warsaw, Poland
 
 """
-from __future__ import print_function, division, absolute_import
 import numpy as np
 import os
 from scipy.spatial import distance
diff --git a/kcsd/sKCSD_utils.py b/kcsd/sKCSD_utils.py
@@ -26,7 +26,6 @@
 OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
-from __future__ import print_function, division, absolute_import
 import os
 import json
 
diff --git a/kcsd/tests/test_loadData.py b/kcsd/tests/test_loadData.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # encoding: utf-8
-from __future__ import print_function, division, absolute_import
 from kcsd import sample_data_path
 from kcsd.sKCSD_utils import LoadData
 import os
diff --git a/kcsd/tests/test_sKCSD.py b/kcsd/tests/test_sKCSD.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # encoding: utf-8
-from __future__ import print_function, division, absolute_import
 import os
 import unittest
 
diff --git a/kcsd/tests/test_sKCSDcell.py b/kcsd/tests/test_sKCSDcell.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # encoding: utf-8
-from __future__ import print_function, division, absolute_import
 import os
 import unittest
 import numpy as np
diff --git a/kcsd/tests/test_sKCSDutils.py b/kcsd/tests/test_sKCSDutils.py
@@ -1,4 +1,3 @@
-from __future__ import print_function, division, absolute_import
 from kcsd.sKCSD_utils import check_estimated_shape
 import os
 import unittest
diff --git a/kcsd/utility_functions.py b/kcsd/utility_functions.py
@@ -23,7 +23,6 @@
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 """
-from __future__ import print_function, division, absolute_import
 import numpy as np
 from scipy import interpolate
 
diff --git a/kcsd/validation/ValidateKCSD.py b/kcsd/validation/ValidateKCSD.py
@@ -3,11 +3,6 @@
 
 """
 
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
 import time
 
 import numpy as np
diff --git a/kcsd/validation/VisibilityMap.py b/kcsd/validation/VisibilityMap.py
@@ -1,10 +1,6 @@
 """These are useful for VisibilityMap estimates in kCSD
 
 """
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-from __future__ import absolute_import
 
 import time
 import numpy as np
diff --git a/kcsd/validation/plotting_functions.py b/kcsd/validation/plotting_functions.py
@@ -4,21 +4,21 @@
 
 @author: Joanna Jędrzejewska-Szmek, Jan Maka
 """
-from __future__ import print_function, division, absolute_import
-import numpy as np
-import matplotlib.pyplot as plt
-from matplotlib.widgets import Slider, Button, RadioButtons
-import matplotlib.gridspec as gridspec
 import os
 import sys
 import argparse
+
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.gridspec as gridspec
+from matplotlib.widgets import Slider, Button
+
 import kcsd.sKCSD_utils as sKCSD_utils
 from kcsd import sKCSDcell
-import glob
-from matplotlib.patches import Circle
-from matplotlib.collections import PatchCollection
 
-max_r = 5 #times a point
+max_r = 5  # times a point
+
+
 def skCSD_reconstruction_plot_z(pots, est_csd, est_pot, cell_obj,
                                 t_min=0, electrode=5):
     """Displays interactive skCSD reconstruction plot in z plane
diff --git a/setup.py b/setup.py
@@ -10,6 +10,7 @@ def readme():
     Used for README
     """
     if sys.version_info.major < 3:
+        print('No support for python versions < 3.8')
         with open('README.rst') as f:
             return f.read().decode('utf-8')
     else:
@@ -22,7 +23,7 @@ def readme():
       description='kernel current source density methods',
       long_description=readme(),
       classifiers=[
-          'Development Status :: 4 - Beta',
+          'Development Status :: 5 - Production/Stable',
           'License :: OSI Approved :: BSD License',
           'Natural Language :: English',
           'Programming Language :: Python :: 3',
@@ -49,15 +50,11 @@ def readme():
                      'data/morphology/*',
                      'data/Simple_with_branches/*',
                      'data/Y_shaped_neuron/*',
-                    ]
+                     'tutorials/*',
+                     'figures/*'
+                     ]
                     },
-      # https://stackoverflow.com/questions/14422340/manifest-in-package-data-and-data-files-clarification
-      # https://github.com/pypa/sampleproject/issues/30#issuecomment-143947944
-      #     os.path.join('sKCSD', 'test.mat')
-      # ]},
-
-      install_requires=['future>=0.16.0',
-                        'numpy>=1.8.0',
+      install_requires=['numpy>=1.8.0',
                         'scipy>=0.14.0',
                         'matplotlib>=2.0'],
       extras_require={'docs': ['numpydoc>=0.5',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import division, print_function`
`2`	`1`	`import run_LFP`
`3`	`2`	`import numpy as np`
`4`	`3`	`import matplotlib.pyplot as plt`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import division, print_function`
`2`	`1`	`import sys`
`3`	`2`	`import os`
`4`	`3`	`from distutils.spawn import find_executable, spawn`