From 05caf7b1a9fed7eda57833226159a636f6eb7b61 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 21 May 2020 11:19:28 -0500 Subject: [PATCH 01/11] print debug --- azure/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/posix.yml b/azure/posix.yml index d9c3dc8..4bcc8a6 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -71,6 +71,7 @@ jobs: before_install clean_code $REPO_DIR $BUILD_COMMIT + gcc --version build_wheel $REPO_DIR $PLAT displayName: Build wheel condition: eq(variables['SKIP_BUILD'], 'false') From 8ec512251e4277ac1d4bae60bd297b6d4459e39e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 26 May 2020 09:20:14 -0500 Subject: [PATCH 02/11] trigger nightly build --- azure/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 4bcc8a6..318b732 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,12 +9,12 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "v1.0.3" + BUILD_COMMIT: "master" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.13.3" CYTHON_BUILD_DEP: "cython==0.29.16" NIGHTLY_BUILD_COMMIT: "master" - NIGHTLY_BUILD: "false" + NIGHTLY_BUILD: "true" TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: "tmp_for_test" strategy: From 176161ecde21d8e35c05172c4a982a3ea77cf1ca Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 26 May 2020 14:49:29 -0500 Subject: [PATCH 03/11] override --- azure/posix.yml | 4 ++-- config.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 318b732..650f5e0 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -71,8 +71,8 @@ jobs: before_install clean_code $REPO_DIR $BUILD_COMMIT - gcc --version - build_wheel $REPO_DIR $PLAT + # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 + CFLAGS=-Wno-error=maybe-uninitialized build_wheel $REPO_DIR $PLAT displayName: Build wheel condition: eq(variables['SKIP_BUILD'], 'false') diff --git a/config.sh b/config.sh index 2b51bdd..52f6240 100644 --- a/config.sh +++ b/config.sh @@ -18,6 +18,7 @@ function pre_build { function build_wheel { # Override common_utils build_wheel function to fix version error # Version error due to versioneer inside submodule + # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 build_bdist_wheel $@ } From 9c63454be988eaded97f09376e8ca4b2e5d4361b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 26 May 2020 15:44:11 -0500 Subject: [PATCH 04/11] override --- azure/posix.yml | 5 +++-- config.sh | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 650f5e0..aba35db 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -17,6 +17,8 @@ jobs: NIGHTLY_BUILD: "true" TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: "tmp_for_test" + # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 + CFLAGS: "-Wno-error=maybe-uninitialized" strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} @@ -71,8 +73,7 @@ jobs: before_install clean_code $REPO_DIR $BUILD_COMMIT - # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 - CFLAGS=-Wno-error=maybe-uninitialized build_wheel $REPO_DIR $PLAT + build_wheel $REPO_DIR $PLAT displayName: Build wheel condition: eq(variables['SKIP_BUILD'], 'false') diff --git a/config.sh b/config.sh index 52f6240..2b51bdd 100644 --- a/config.sh +++ b/config.sh @@ -18,7 +18,6 @@ function pre_build { function build_wheel { # Override common_utils build_wheel function to fix version error # Version error due to versioneer inside submodule - # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 build_bdist_wheel $@ } From aa6dc0c9b4f49ee01e2c70414405bc29c012387b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 26 May 2020 16:00:31 -0500 Subject: [PATCH 05/11] sign-compare --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index aba35db..01244c6 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -18,7 +18,7 @@ jobs: TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: "tmp_for_test" # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 - CFLAGS: "-Wno-error=maybe-uninitialized" + CFLAGS: "-Wno-error=maybe-uninitialized -Wno-error=sign-compare" strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} From 82776058a01d552ca6624c469e17b9b389372cc3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 26 May 2020 16:15:07 -0500 Subject: [PATCH 06/11] added env_vars --- azure/posix.yml | 2 -- env_vars.sh | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 env_vars.sh diff --git a/azure/posix.yml b/azure/posix.yml index 01244c6..e7d5828 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -17,8 +17,6 @@ jobs: NIGHTLY_BUILD: "true" TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: "tmp_for_test" - # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 - CFLAGS: "-Wno-error=maybe-uninitialized -Wno-error=sign-compare" strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} diff --git a/env_vars.sh b/env_vars.sh new file mode 100644 index 0000000..a8e2398 --- /dev/null +++ b/env_vars.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# Environment variables for build +MACOSX_DEPLOYMENT_TARGET=10.9 +# CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 +CFLAGS="-Wno-error=maybe-uninitialized -Wno-error=sign-compare" +# Macos's linker doesn't support stripping symbols +if [ "$(uname)" != "Darwin" ]; then + LDFLAGS="-Wl,--strip-debug" + # make sure that LDFLAGS is exposed to child processes, + # since current version of manybuild only export CFLAGS, CPPFLAGS and FFLAGS + export LDFLAGS="$LDFLAGS" + # override the default stripping flags, since we only override CFLAGS and + # the current version of manybuild pass "-strip-all" to CPPFLAGS and FFLAGS + STRIP_FLAGS="" +fi +# For verbosity: report where each command came from +export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): } +set -x From a3f9c9e3854fc90228c7c0174be13d57ea110e45 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 26 May 2020 16:25:36 -0500 Subject: [PATCH 07/11] typo --- env_vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env_vars.sh b/env_vars.sh index a8e2398..8079c51 100644 --- a/env_vars.sh +++ b/env_vars.sh @@ -14,5 +14,5 @@ if [ "$(uname)" != "Darwin" ]; then STRIP_FLAGS="" fi # For verbosity: report where each command came from -export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): } +export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' set -x From 219f7de2f8cc7f9b051141f0deadd51a77deb0e8 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 26 May 2020 16:38:16 -0500 Subject: [PATCH 08/11] try c99 --- env_vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env_vars.sh b/env_vars.sh index 8079c51..e1441d2 100644 --- a/env_vars.sh +++ b/env_vars.sh @@ -2,7 +2,7 @@ # Environment variables for build MACOSX_DEPLOYMENT_TARGET=10.9 # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 -CFLAGS="-Wno-error=maybe-uninitialized -Wno-error=sign-compare" +CFLAGS="-std=c99 -Wno-error=maybe-uninitialized -Wno-error=sign-compare" # Macos's linker doesn't support stripping symbols if [ "$(uname)" != "Darwin" ]; then LDFLAGS="-Wl,--strip-debug" From 320cad229446772e02b137c7d19b96a8161fffdc Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 May 2020 08:52:36 -0500 Subject: [PATCH 09/11] ansi C --- env_vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env_vars.sh b/env_vars.sh index e1441d2..5ecf9eb 100644 --- a/env_vars.sh +++ b/env_vars.sh @@ -2,7 +2,7 @@ # Environment variables for build MACOSX_DEPLOYMENT_TARGET=10.9 # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 -CFLAGS="-std=c99 -Wno-error=maybe-uninitialized -Wno-error=sign-compare" +CFLAGS="-ansi -Wno-error=maybe-uninitialized -Wno-error=sign-compare" # Macos's linker doesn't support stripping symbols if [ "$(uname)" != "Darwin" ]; then LDFLAGS="-Wl,--strip-debug" From 1cc7a7e306d92232b5a7bf9ca192d4858834637e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 May 2020 09:44:07 -0500 Subject: [PATCH 10/11] return type --- env_vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env_vars.sh b/env_vars.sh index 5ecf9eb..5733b77 100644 --- a/env_vars.sh +++ b/env_vars.sh @@ -2,7 +2,7 @@ # Environment variables for build MACOSX_DEPLOYMENT_TARGET=10.9 # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 -CFLAGS="-ansi -Wno-error=maybe-uninitialized -Wno-error=sign-compare" +CFLAGS="-ansi -Wno-error=maybe-uninitialized -Wno-error=sign-compare -Wno-error=return-type" # Macos's linker doesn't support stripping symbols if [ "$(uname)" != "Darwin" ]; then LDFLAGS="-Wl,--strip-debug" From 604e2a9b5a74eddd165f4152da6643bc4f4d60ff Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 May 2020 09:45:29 -0500 Subject: [PATCH 11/11] linux only --- env_vars.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/env_vars.sh b/env_vars.sh index 5733b77..7f56717 100644 --- a/env_vars.sh +++ b/env_vars.sh @@ -2,7 +2,9 @@ # Environment variables for build MACOSX_DEPLOYMENT_TARGET=10.9 # CFLAGS override for https://github.com/pandas-dev/pandas/issues/34114 -CFLAGS="-ansi -Wno-error=maybe-uninitialized -Wno-error=sign-compare -Wno-error=return-type" +if [ "$(uname)" == "Linux" ]; then + CFLAGS="-ansi -Wno-error=maybe-uninitialized -Wno-error=sign-compare -Wno-error=return-type" +fi # Macos's linker doesn't support stripping symbols if [ "$(uname)" != "Darwin" ]; then LDFLAGS="-Wl,--strip-debug"