From c8b3853d6e6a846d71032f87e19da68bb7ed6a19 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 25 Apr 2017 21:04:48 -0500 Subject: [PATCH 1/2] MAINT: asv with py3 on windows --- asv_bench/asv.conf.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 62f1c090a7462..7beb3af3dbaa0 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -46,7 +46,6 @@ "numexpr": [], "pytables": [null, ""], // platform dependent, see excludes below "tables": [null, ""], - "libpython": [null, ""], "openpyxl": [], "xlsxwriter": [], "xlrd": [], @@ -80,10 +79,6 @@ {"environment_type": "conda", "pytables": null}, {"environment_type": "(?!conda).*", "tables": null}, {"environment_type": "(?!conda).*", "pytables": ""}, - // On conda&win32, install libpython - {"sys_platform": "(?!win32).*", "libpython": ""}, - {"environment_type": "conda", "sys_platform": "win32", "libpython": null}, - {"environment_type": "(?!conda).*", "libpython": ""} ], "include": [], From 42f47bc1ca109c33c07172bffdba4882f4fec038 Mon Sep 17 00:00:00 2001 From: chris-b1 Date: Wed, 26 Apr 2017 08:15:00 -0500 Subject: [PATCH 2/2] add comment about libpython --- asv_bench/asv.conf.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 7beb3af3dbaa0..59c05400d06b0 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -51,6 +51,9 @@ "xlrd": [], "xlwt": [], "pytest": [], + // If using Windows with python 2.7 and want to build using the + // mingw toolchain (rather than MSVC), uncomment the following line. + // "libpython": [], }, // Combinations of libraries/python versions can be excluded/included