Add support for matplotlib 2 and 3 (#52)

* Try both two methods when setting the background color in matplotlib
* Add matrix of tests for matplotlib versions
* Remove verbal support for python version 3.3

Author: djordon

.travis.yml

@@ -3,18 +3,27 @@ dist: trusty
 language: python
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
 cache: pip
 env:
   global:
     - CFLAGS="-coverage"
     - TRAVIS_TEST=true
+  matrix:
+    - MATPLOTLIB_VERSION=1.5.1
+    - MATPLOTLIB_VERSION=2.2.3
+    - MATPLOTLIB_VERSION=3.0.2
+matrix:
+  exclude:
+  - python: 2.7
+    env: MATPLOTLIB_VERSION=3.0.2
+  - python: 3.4
+    env: MATPLOTLIB_VERSION=3.0.2
 install:
   - pip install --upgrade pip
   - pip install $(grep 'pytest' requirements.txt)
-  - pip install coveralls coverage matplotlib==1.5.1
+  - pip install coveralls coverage matplotlib==$MATPLOTLIB_VERSION
   - pip install -e .
 before_script:
   - "export DISPLAY=:99.0"

README.rst

@@ -37,7 +37,7 @@ Installation
 ------------
 
 
-**Prerequisites:** Queueing-tool runs on Python 2.7 and 3.3-3.5 and it
+**Prerequisites:** Queueing-tool runs on Python 2.7 and 3.4-3.5 and it
 requires `networkx <http://networkx.readthedocs.org/en/stable/>`__ and
 `numpy <http://www.numpy.org/>`__. If you want to plot, you will need
 to install `matplotlib <http://matplotlib.org/>`__ as well.

VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

queueing_tool/__init__.py

@@ -10,7 +10,7 @@
 import queueing_tool.graph as graph
 
 __all__ = []
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 
 __all__.extend(['__version__'])
 __all__.extend(queues.__all__)

queueing_tool/graph/graph_wrapper.py

@@ -411,7 +411,11 @@ def draw_graph(self, line_kwargs=None, scatter_kwargs=None, **kwargs):
         ax.add_collection(edge_collection)
         ax.scatter(**scatter_kwargs)
 
-        ax.set_axis_bgcolor(kwargs.get('bgcolor', [1, 1, 1, 1]))
+        if hasattr(ax, 'set_facecolor'):
+            ax.set_facecolor(kwargs.get('bgcolor', [1, 1, 1, 1]))
+        else:
+            ax.set_axis_bgcolor(kwargs.get('bgcolor', [1, 1, 1, 1]))
+
         ax.get_xaxis().set_visible(False)
         ax.get_yaxis().set_visible(False)
 

queueing_tool/network/queue_network.py

@@ -536,7 +536,11 @@ def update(frame_number):
             scatt.set_edgecolors(scat_args['edgecolors'])
             scatt.set_facecolor(scat_args['c'])
 
-        ax.set_axis_bgcolor(kwargs['bgcolor'])
+        if hasattr(ax, 'set_facecolor'):
+            ax.set_facecolor(kwargs['bgcolor'])
+        else:
+            ax.set_axis_bgcolor(kwargs['bgcolor'])
+
         ax.get_xaxis().set_visible(False)
         ax.get_yaxis().set_visible(False)
 

setup.py

@@ -46,7 +46,6 @@
     'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Cython',