pycortex 1.2.8__tar.gz → 1.2.9__tar.gz

{pycortex-1.2.8 → pycortex-1.2.9}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: pycortex
-Version: 1.2.8
+Version: 1.2.9
 Summary: Python Cortical mapping software for fMRI data
 Home-page: http://gallantlab.github.io/pycortex
-Download-URL: http://gallantlab.github.io/pycortex
 Author: James Gao
 Author-email: james@jamesgao.com
 License: 2-clause BSD license
+Download-URL: http://gallantlab.github.io/pycortex
+Platform: UNKNOWN
 Classifier: Development Status :: 6 - Mature
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License
@@ -16,22 +17,6 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Visualization
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: future
-Requires-Dist: numpy
-Requires-Dist: scipy
-Requires-Dist: tornado>=4.3
-Requires-Dist: shapely
-Requires-Dist: lxml
-Requires-Dist: html5lib
-Requires-Dist: h5py
-Requires-Dist: numexpr
-Requires-Dist: cython<3.0
-Requires-Dist: matplotlib
-Requires-Dist: pillow
-Requires-Dist: nibabel>=2.1
-Requires-Dist: networkx>=2.1
-Requires-Dist: imageio
-Requires-Dist: wget
 
 pycortex
 ========
@@ -107,3 +92,5 @@ Citation
 If you use pycortex in published work, please cite the [pycortex paper](http://dx.doi.org/10.3389/fninf.2015.00023):
 
 _Gao JS, Huth AG, Lescroart MD and Gallant JL (2015) Pycortex: an interactive surface visualizer for fMRI. Front. Neuroinform. 9:23. doi: 10.3389/fninf.2015.00023_
+
+

{pycortex-1.2.8 → pycortex-1.2.9}/cortex/dataset/views.py

@@ -1,14 +1,23 @@
-import os
 import glob
 import json
+import os
+
 import h5py
 import numpy as np
 
 from .. import options
-from .braindata import BrainData, VolumeData, VertexData
+from .braindata import BrainData, VertexData, VolumeData
 
 default_cmap = options.config.get("basic", "default_cmap")
 
+# register_cmap is deprecated in matplotlib > 3.7.0 and replaced by colormaps.register
+try:
+    from matplotlib import colormaps as cm
+    def register_cmap(cmap):
+        return cm.register(cmap)
+except ImportError:
+    from matplotlib.cm import register_cmap
+
 
 def normalize(data):
     if isinstance(data, tuple):
@@ -193,7 +202,8 @@ class Dataview(object):
     def get_cmapdict(self):
         """Returns a dictionary with cmap information."""
 
-        from matplotlib import colors, pyplot as plt
+        from matplotlib import colors
+        from matplotlib import pyplot as plt
 
         try:
             # plt.get_cmap accepts:
@@ -206,18 +216,19 @@ class Dataview(object):
             cmapdir = options.config.get('webgl', 'colormaps')
             colormaps = glob.glob(os.path.join(cmapdir, "*.png"))
             colormaps = dict(((os.path.split(c)[1][:-4], c) for c in colormaps))
-            if not self.cmap in colormaps:
+            if self.cmap not in colormaps:
                 raise ValueError('Unkown color map %s' % self.cmap)
             I = plt.imread(colormaps[self.cmap])
-            cmap = colors.ListedColormap(np.squeeze(I))
+            name = self.cmap if isinstance(self.cmap, str) else self.cmap.name
+            cmap = colors.ListedColormap(np.squeeze(I), name=name)
             # Register colormap to matplotlib to avoid loading it again
-            plt.register_cmap(self.cmap, cmap)
+            register_cmap(cmap)
 
         return dict(cmap=cmap, vmin=self.vmin, vmax=self.vmax)
 
     @property
     def raw(self):
-        from matplotlib import colors, cm
+        from matplotlib import cm, colors
 
         cmap = self.get_cmapdict()['cmap']
         # Normalize colors according to vmin, vmax
@@ -398,5 +409,5 @@ def u(s, encoding='utf8'):
         return s
 
 
-from .viewRGB import VolumeRGB, VertexRGB, Colors
-from .view2D import Volume2D, Vertex2D
+from .viewRGB import Colors, VertexRGB, VolumeRGB
+from .view2D import Vertex2D, Volume2D