From 1b03d1eed141abd86667a539d465dbf0bd65f0a4 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 24 Sep 2020 11:27:41 +0100 Subject: [PATCH 01/14] test wheel build status in advance of 1.1.3 release --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index e316f2d..e046ea6 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "v1.1.2" + BUILD_COMMIT: "1.1.x" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.13.3" CYTHON_BUILD_DEP: "cython==0.29.16" diff --git a/azure/windows.yml b/azure/windows.yml index de73ca3..df5cb06 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.1.2" + BUILD_COMMIT: "1.1.x" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.16" NIGHTLY_BUILD_COMMIT: "master" From 4fd54236cc369f52c314e1ae45a0eb45a02fec2c Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 24 Sep 2020 11:47:26 +0100 Subject: [PATCH 02/14] update cython build dep --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index e046ea6..47a8c6f 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -12,7 +12,7 @@ jobs: BUILD_COMMIT: "1.1.x" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.13.3" - CYTHON_BUILD_DEP: "cython==0.29.16" + CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest pytest-xdist==1.* hypothesis" diff --git a/azure/windows.yml b/azure/windows.yml index df5cb06..a610920 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -10,7 +10,7 @@ jobs: variables: BUILD_COMMIT: "1.1.x" NP_BUILD_DEP: "1.13.3" - CYTHON_BUILD_DEP: "0.29.16" + CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" PYTHON_ARCH: "x64" From 77cc8f82cc986a528413e1c88e697dbbef37ba9f Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 24 Sep 2020 11:55:48 +0100 Subject: [PATCH 03/14] update NP_BUILD_DEP --- azure-pipelines.yml | 18 +++++++++--------- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a0177fb..7b7bdcc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,20 +22,20 @@ jobs: py_3.6_32: PYTHON_VERSION: "3.6" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.13.3" + NP_BUILD_DEP: "1.16.5" py_3.6_64: PYTHON_VERSION: "3.6" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.13.3" + NP_BUILD_DEP: "1.16.5" py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" + NP_BUILD_DEP: "1.16.5" NIGHTLY_BUILD: "true" py_3.7_64: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.14.5" + NP_BUILD_DEP: "1.16.5" NIGHTLY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8" @@ -61,11 +61,11 @@ jobs: py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" - NP_BUILD_DEP: "numpy==1.14.5" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.8_32: MB_PYTHON_VERSION: "3.8" @@ -84,12 +84,12 @@ jobs: matrix: py_3.6_64: MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.13.3" + NP_BUILD_DEP: "numpy==1.16.5" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index 47a8c6f..c3bd772 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,7 +11,7 @@ jobs: REPO_DIR: "pandas" BUILD_COMMIT: "1.1.x" PLAT: "x86_64" - NP_BUILD_DEP: "numpy==1.13.3" + NP_BUILD_DEP: "numpy==1.16.5" CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" diff --git a/azure/windows.yml b/azure/windows.yml index a610920..d720888 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: BUILD_COMMIT: "1.1.x" - NP_BUILD_DEP: "1.13.3" + NP_BUILD_DEP: "1.16.5" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" From 01818713e1ddd0fbe6b44216ababba1edf9c8cf5 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 24 Sep 2020 12:03:06 +0100 Subject: [PATCH 04/14] fix wrong change --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b7bdcc..3e60aba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -91,5 +91,5 @@ jobs: NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.16.5" + NP_BUILD_DEP: "numpy==1.17.3" NIGHTLY_BUILD: "true" From ad0b60a84dc1404463e33471598ca947b5193c6f Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 24 Sep 2020 12:10:48 +0100 Subject: [PATCH 05/14] 1.16.5 -> 1.15.4 --- azure-pipelines.yml | 16 ++++++++-------- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e60aba..3d40d48 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,20 +22,20 @@ jobs: py_3.6_32: PYTHON_VERSION: "3.6" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.16.5" + NP_BUILD_DEP: "1.15.4" py_3.6_64: PYTHON_VERSION: "3.6" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.16.5" + NP_BUILD_DEP: "1.15.4" py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.16.5" + NP_BUILD_DEP: "1.15.4" NIGHTLY_BUILD: "true" py_3.7_64: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.16.5" + NP_BUILD_DEP: "1.15.4" NIGHTLY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8" @@ -61,11 +61,11 @@ jobs: py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" - NP_BUILD_DEP: "numpy==1.16.5" + NP_BUILD_DEP: "numpy==1.15.4" NIGHTLY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.16.5" + NP_BUILD_DEP: "numpy==1.15.4" NIGHTLY_BUILD: "true" py_3.8_32: MB_PYTHON_VERSION: "3.8" @@ -84,10 +84,10 @@ jobs: matrix: py_3.6_64: MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.16.5" + NP_BUILD_DEP: "numpy==1.15.4" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.16.5" + NP_BUILD_DEP: "numpy==1.15.4" NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" diff --git a/azure/posix.yml b/azure/posix.yml index c3bd772..8283e76 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,7 +11,7 @@ jobs: REPO_DIR: "pandas" BUILD_COMMIT: "1.1.x" PLAT: "x86_64" - NP_BUILD_DEP: "numpy==1.16.5" + NP_BUILD_DEP: "numpy==1.15.4" CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" diff --git a/azure/windows.yml b/azure/windows.yml index d720888..7a834c9 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: BUILD_COMMIT: "1.1.x" - NP_BUILD_DEP: "1.16.5" + NP_BUILD_DEP: "1.15.4" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" From 32cfe65fd98c8d94a8a50e87b24458b6b178771e Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sat, 26 Sep 2020 13:27:06 +0100 Subject: [PATCH 06/14] remove vscode settings --- .gitignore | 1 + .vscode/settings.json | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index c8cda81..3a75c8f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ .vagrant .noseids .ipynb_checkpoints +.vscode/ # Compiled source # ################### diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3cce948..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "restructuredtext.confPath": "" -} \ No newline at end of file From e9aea055533510f1cae17fa33833688f8b46742e Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sat, 26 Sep 2020 13:29:40 +0100 Subject: [PATCH 07/14] revert NP_BUILD_DEP for now --- azure-pipelines.yml | 16 ++++++++-------- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3d40d48..a0177fb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,20 +22,20 @@ jobs: py_3.6_32: PYTHON_VERSION: "3.6" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.13.3" py_3.6_64: PYTHON_VERSION: "3.6" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.13.3" py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.14.5" NIGHTLY_BUILD: "true" py_3.7_64: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.14.5" NIGHTLY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8" @@ -61,11 +61,11 @@ jobs: py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.14.5" NIGHTLY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.14.5" NIGHTLY_BUILD: "true" py_3.8_32: MB_PYTHON_VERSION: "3.8" @@ -84,10 +84,10 @@ jobs: matrix: py_3.6_64: MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.13.3" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.14.5" NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" diff --git a/azure/posix.yml b/azure/posix.yml index 8283e76..47a8c6f 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,7 +11,7 @@ jobs: REPO_DIR: "pandas" BUILD_COMMIT: "1.1.x" PLAT: "x86_64" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.13.3" CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" diff --git a/azure/windows.yml b/azure/windows.yml index 7a834c9..a610920 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: BUILD_COMMIT: "1.1.x" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" From 82eca912f6d1743fe608b09da483e5368998bbbc Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sun, 27 Sep 2020 15:31:19 +0100 Subject: [PATCH 08/14] empty commit From 9205d4e2bb45374e33fb411dbc9d81d51f58cbb5 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 28 Sep 2020 10:52:56 +0100 Subject: [PATCH 09/14] empty commit From bdf193539ff6139f7a64f1a5b9c14993a8008b0c Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 29 Sep 2020 08:58:50 +0100 Subject: [PATCH 10/14] empty comit From 3035e271f552e17ae4a6d91a64cf3862c6cec7e7 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 29 Sep 2020 09:20:16 +0100 Subject: [PATCH 11/14] empty commit From 1f7fdbc2e20ed75ba68aecd5ff047c6ffc61cd50 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 29 Sep 2020 14:59:59 +0100 Subject: [PATCH 12/14] empty commit From 0954152394f3da1cd2492fb9843c41f8ea5f039b Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sat, 3 Oct 2020 11:37:30 +0100 Subject: [PATCH 13/14] empty commit From 8a80bf120f9ae3c06504520d82ebfc9ce2085948 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 5 Oct 2020 10:40:52 +0100 Subject: [PATCH 14/14] empty commit