Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 438edde

Browse files
committed
Drop mention of msinttypes in Windows build.
It provides stdint.h/inttypes.h but that's unneeded since MSVC 2013; building for Py3.6 requires MSVC 2015 anyways. See https://github.com/conda-forge/msinttypes-feedstock https://devblogs.microsoft.com/cppblog/c99-library-support-in-visual-studio-2013/ https://packaging.python.org/guides/packaging-binary-extensions/#binary-extensions-for-windows Also misc. cleanups to .appveyor.yml.
1 parent 289130d commit 438edde

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.appveyor.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ environment:
2020
--cov-report= --cov=lib --log-level=DEBUG
2121

2222
matrix:
23-
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
24-
# one for 64bit because we construct envs anyway. But using one for the
25-
# right python version is hopefully making it fast due to package caching.
23+
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
24+
# the envs anyway. But using one for the right python version hopefully
25+
# making things faster due to package caching.
2626
- PYTHON_VERSION: "3.6"
2727
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
2828
TEST_ALL: "no"
@@ -48,7 +48,6 @@ init:
4848
install:
4949
- set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
5050
- set PYTHONUNBUFFERED=1
51-
# for msinttypes and newer stuff
5251
- conda config --set always_yes true
5352
- conda update --all
5453
- conda config --set show_channel_urls yes
@@ -58,16 +57,13 @@ install:
5857
- conda info -a
5958

6059
# For building, use a new environment which only includes the requirements for mpl
61-
# same things as the requirements in ci/conda_recipe/meta.yaml
6260
# if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
6361
# https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
64-
#
6562
- conda create -q -n test-environment python=%PYTHON_VERSION%
66-
msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
63+
freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
6764
pip setuptools numpy sphinx tornado
6865
- activate test-environment
6966
- echo %PYTHON_VERSION% %TARGET_ARCH%
70-
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
7167
- pip install -r requirements/testing/travis_all.txt -r requirements/testing/travis36.txt
7268

7369
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3

INSTALL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ the list of conda packages.
298298

299299
::
300300

301-
conda create -n "matplotlib_build" python=3.7 numpy python-dateutil pyparsing tornado cycler tk libpng zlib freetype msinttypes
301+
conda create -n "matplotlib_build" python=3.7 numpy python-dateutil pyparsing tornado cycler tk libpng zlib freetype
302302
conda activate matplotlib_build
303303
# force the build against static libpng and zlib libraries
304304
set MPLSTATICBUILD=True

0 commit comments

Comments
 (0)