[plotting] Fix dependencies around matplotlib

Author: amotl

Makefile

@@ -35,7 +35,7 @@ virtualenv-docs: setup-virtualenv
 # Install requirements for development.
 virtualenv-dev: setup-virtualenv
 	@$(pip) install --upgrade --prefer-binary --requirement=requirements-test.txt
-	@$(pip) install --upgrade --prefer-binary --editable=.[daq,daq_geospatial,export,scientific,firmware]
+	@$(pip) install --upgrade --prefer-binary --editable=.[daq,daq_geospatial,export,plotting,scientific,firmware]
 
 # Install requirements for releasing.
 install-releasetools: setup-virtualenv

setup.py

@@ -102,11 +102,9 @@
 
     'plotting': [
         #'dyplot==0.8.8',
-
-        'matplotlib>=3,<3.4',
+        'matplotlib>=3.6,<3.8',
+        'plotnine<0.13',
         #'cairocffi>=0.5.4',
-        'bokeh>=1.4.0,<3.1',
-        'vincent>=0.4.4,<0.5',
     ],
 
     # Data export: Scientific data formats like HDF5 and NetCDF and plots from ggplot
@@ -124,15 +122,16 @@
         # Algorithms
         # ----------
         #'scipy>=1.4.1,<1.6',
-        'plotnine<0.13',
 
         # gfortran
         # aptitude install libatlas-base-dev lapack-dev gfortran or
         # https://gcc.gnu.org/wiki/GFortranBinaries
 
         # Visualization
         # -------------
+        'bokeh>=1.4.0,<3.1',
         #'seaborn==0.7.1',
+        'vincent>=0.4.4,<0.5',
 
     ],