python3-matplotlib: Update to 3.1.0
This commit is contained in:
@@ -1,37 +1,28 @@
|
||||
--- matplotlib-3.0.0/setupext.py.orig 2018-09-18 05:17:52.000000000 +0200
|
||||
+++ matplotlib-3.0.0/setupext.py 2018-09-20 12:51:06.529116400 +0200
|
||||
@@ -22,6 +22,7 @@
|
||||
import setuptools
|
||||
import versioneer
|
||||
--- matplotlib-3.1.0/setupext.py.orig 2019-05-18 03:55:28.000000000 +0200
|
||||
+++ matplotlib-3.1.0/setupext.py 2019-05-19 11:31:01.633173900 +0200
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
_log = logging.getLogger(__name__)
|
||||
|
||||
+MSYS = "MSYSTEM" in os.environ
|
||||
|
||||
def _get_xdg_cache_dir():
|
||||
"""
|
||||
@@ -267,7 +268,7 @@
|
||||
"""
|
||||
Determines whether pkg-config exists on this machine.
|
||||
"""
|
||||
@@ -220,7 +221,7 @@
|
||||
def __init__(self):
|
||||
"""Determines whether pkg-config exists on this machine."""
|
||||
self.pkg_config = None
|
||||
- if sys.platform != 'win32':
|
||||
+ if sys.platform != 'win32' or MSYS:
|
||||
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
|
||||
if shutil.which(pkg_config) is not None:
|
||||
self.pkg_config = pkg_config
|
||||
@@ -276,7 +277,7 @@
|
||||
|
||||
# conda Windows header and library paths.
|
||||
# https://github.com/conda/conda/issues/2312 re: getting the env dir.
|
||||
- if sys.platform == 'win32':
|
||||
+ if sys.platform == 'win32' and not MSYS:
|
||||
self.has_pkgconfig = False
|
||||
else:
|
||||
self.pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
|
||||
@@ -946,7 +947,7 @@
|
||||
if options.get('local_freetype'):
|
||||
return "Using local version for testing"
|
||||
|
||||
- if sys.platform == 'win32':
|
||||
+ if sys.platform == 'win32' and not MSYS:
|
||||
try:
|
||||
check_include_file(get_include_dirs(), 'ft2build.h', 'freetype')
|
||||
except CheckFailed:
|
||||
@@ -1176,7 +1177,7 @@
|
||||
}
|
||||
|
||||
def check(self):
|
||||
- if sys.platform == 'win32':
|
||||
+ if sys.platform == 'win32' and not MSYS:
|
||||
check_include_file(get_include_dirs(), 'png.h', 'png')
|
||||
return 'Using unknown version found on system.'
|
||||
|
||||
conda_env_path = (os.getenv('CONDA_PREFIX') # conda >= 4.1
|
||||
or os.getenv('CONDA_DEFAULT_ENV')) # conda < 4.1
|
||||
if conda_env_path and os.path.isdir(conda_env_path):
|
||||
|
||||
Reference in New Issue
Block a user