Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python-matplotlib: Update to 3.2.0

Browse Source
This commit is contained in:
Alexey Pavlov
2020-03-05 08:47:22 +03:00
parent c6147e221e
commit 725405d414
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mingw-w64-python-matplotlib/setupext.py.patch
View File

@@ -8,21 +8,21 @@
def _get_xdg_cache_dir():
"""
@@ -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
@@ -232,7 +233,7 @@
"""
Get path to pkg-config and set up the PKG_CONFIG environment variable.
"""
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
return None
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
if shutil.which(pkg_config) is None:
@@ -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:
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):
# 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:
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):