Commit 1a3166f0 authored by Roman Yurchak's avatar Roman Yurchak Committed by GitHub

Merge pull request #149 from mdboom/matplotlib-2.2.3

Update to Matplotlib 2.2.3
parents 88194ab2 2adcc8ce
package:
name: matplotlib
version: 2.2.2
version: 2.2.3
source:
url: https://files.pythonhosted.org/packages/ec/ed/46b835da53b7ed05bd4c6cae293f13ec26e877d2e490a53a709915a9dcb7/matplotlib-2.2.2.tar.gz
md5: dd1e49e041309a7fd4e32be8bf17c3b6
url: https://files.pythonhosted.org/packages/eb/a0/31b6ba00bc4dcbc06f0b80d1ad6119a9cc3081ecb04a00117f6c1ca3a084/matplotlib-2.2.3.tar.gz
sha256: 7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5
patches:
- patches/disable_bz2.patch
- patches/dummy_threading.patch
- patches/font_name_encoding.patch
- patches/force_malloc_free.patch
- patches/hardcoded_font_cache.patch
......
diff -ur matplotlib-2.2.2/lib/matplotlib/cbook/__init__.py matplotlib-2.2.2/lib/matplotlib/cbook/__init__.py
--- a/lib/matplotlib/cbook/__init__.py 2018-03-05 23:47:09.000000000 -0500
+++ b/lib/matplotlib/cbook/__init__.py 2018-05-17 09:39:11.514431317 -0400
@@ -10,7 +10,7 @@
import six
from six.moves import xrange, zip
-import bz2
+# import bz2
import collections
import contextlib
import datetime
@@ -601,10 +601,10 @@
# get rid of 'U' in flag for gzipped files.
flag = flag.replace('U', '')
fh = gzip.open(fname, flag)
- elif fname.endswith('.bz2'):
- # get rid of 'U' in flag for bz2 files
- flag = flag.replace('U', '')
- fh = bz2.BZ2File(fname, flag)
+ # elif fname.endswith('.bz2'):
+ # # get rid of 'U' in flag for bz2 files
+ # flag = flag.replace('U', '')
+ # fh = bz2.BZ2File(fname, flag)
else:
fh = io.open(fname, flag, encoding=encoding)
opened = True
diff -ur matplotlib-2.2.2/lib/matplotlib/backends/backend_agg.py matplotlib-2.2.2/lib/matplotlib/backends/backend_agg.py
--- a/lib/matplotlib/backends/backend_agg.py 2018-03-17 14:03:23.000000000 -0400
+++ b/lib/matplotlib/backends/backend_agg.py 2018-05-17 09:43:34.710665159 -0400
@@ -24,7 +24,10 @@
import six
-import threading
+try:
+ import threading
+except ImportError:
+ import dummy_threading as threading
import numpy as np
from collections import OrderedDict
from math import radians, cos, sin
diff -ur matplotlib-2.2.2/lib/matplotlib/font_manager.py matplotlib-2.2.2/lib/matplotlib/font_manager.py
--- a/lib/matplotlib/font_manager.py 2018-03-17 14:03:23.000000000 -0400
+++ b/lib/matplotlib/font_manager.py 2018-05-16 16:56:49.399466649 -0400
@@ -48,7 +48,10 @@
import json
import os
import sys
-from threading import Timer
+try:
+ from threading import Timer
+except ImportError:
+ from dummy_threading import Timer
import warnings
import logging
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment