From f22feed4c162b3548e14cae6f2e55fae79c6ccf8 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 23 Sep 2021 14:22:46 -0700 Subject: [PATCH 01/36] Update pyproject.toml --- pyproject.toml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index aa602bba630c2..5327ebfda98f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,18 +4,24 @@ requires = [ "setuptools>=51.0.0", "wheel", - "Cython>=0.29.21,<3", # Note: sync with setup.py + "Cython>=0.29.24,<3", # Note: sync with setup.py # Numpy requirements for different OS/architectures # Copied from https://github.com/scipy/scipy/blob/master/pyproject.toml (which is also licensed under BSD) "numpy==1.17.3; python_version=='3.7' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'", "numpy==1.18.3; python_version=='3.8' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'", - "numpy==1.19.3; python_version>='3.9' and (platform_machine!='arm64' or platform_system!='Darwin')", + "numpy==1.19.3; python_version=='3.9' and (platform_machine!='arm64' or platform_system!='Darwin')", # Aarch64(Python 3.9 requirements are the same as AMD64) "numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64'", "numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'", # Darwin Arm64 "numpy>=1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'", - "numpy>=1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'" + "numpy>=1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'", + # For Python versions which aren't yet officially supported, + # we specify an unpinned NumPy which allows source distributions + # to be used and allows wheels to be used as soon as they + # become available. + "numpy; python_version>='3.10'", + "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'", ] # uncomment to enable pep517 after versioneer problem is fixed. # https://github.com/python-versioneer/python-versioneer/issues/193 From 4d5ab7f92dc5841c69466fe57444540bc3d52c20 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 23 Sep 2021 14:23:03 -0700 Subject: [PATCH 02/36] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 337719053585c..f5151621c9efe 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ def is_platform_mac(): return sys.platform == "darwin" -min_cython_ver = "0.29.21" # note: sync with pyproject.toml +min_cython_ver = "0.29.24" # note: sync with pyproject.toml try: from Cython import ( From 2cf1f0b9ba6c126e1b351f7457c2a43cd999fdef Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 23 Sep 2021 17:00:10 -0700 Subject: [PATCH 03/36] Update pyproject.toml --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5327ebfda98f1..a5022fc7a2b10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ requires = [ "wheel", "Cython>=0.29.24,<3", # Note: sync with setup.py # Numpy requirements for different OS/architectures - # Copied from https://github.com/scipy/scipy/blob/master/pyproject.toml (which is also licensed under BSD) + # Adapted from https://github.com/scipy/scipy/blob/master/pyproject.toml (which is also licensed under BSD) "numpy==1.17.3; python_version=='3.7' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'", "numpy==1.18.3; python_version=='3.8' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'", "numpy==1.19.3; python_version=='3.9' and (platform_machine!='arm64' or platform_system!='Darwin')", @@ -20,7 +20,8 @@ requires = [ # we specify an unpinned NumPy which allows source distributions # to be used and allows wheels to be used as soon as they # become available. - "numpy; python_version>='3.10'", + "numpy>=1.21.2; python_version=='3.10'", + "numpy; python_version>'3.10'", "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'", ] # uncomment to enable pep517 after versioneer problem is fixed. From fc4329b6142f2cc2293c7a918961a8ad81f9f73e Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 23 Sep 2021 19:06:38 -0700 Subject: [PATCH 04/36] Update pyproject.toml --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a5022fc7a2b10..e12a6f9e28151 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,13 +14,13 @@ requires = [ "numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64'", "numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'", # Darwin Arm64 - "numpy>=1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'", - "numpy>=1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'", + "numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'", + "numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'", # For Python versions which aren't yet officially supported, # we specify an unpinned NumPy which allows source distributions # to be used and allows wheels to be used as soon as they # become available. - "numpy>=1.21.2; python_version=='3.10'", + "numpy==1.21.2; python_version=='3.10'", "numpy; python_version>'3.10'", "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'", ] From 0360bae1a196b30adfba1690935ad22dd064ecef Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 23 Sep 2021 19:12:32 -0700 Subject: [PATCH 05/36] Update setup.cfg --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 62ff0c6934f77..0882e4f724099 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,7 @@ classifiers = Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Topic :: Scientific/Engineering project_urls = Bug Tracker = https://github.com/pandas-dev/pandas/issues From 98be5bd72b0093943933562227cde48b92c0284b Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:48:50 -0700 Subject: [PATCH 06/36] Update pyproject.toml --- pyproject.toml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e12a6f9e28151..27aecdab0ce99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,24 +5,7 @@ requires = [ "setuptools>=51.0.0", "wheel", "Cython>=0.29.24,<3", # Note: sync with setup.py - # Numpy requirements for different OS/architectures - # Adapted from https://github.com/scipy/scipy/blob/master/pyproject.toml (which is also licensed under BSD) - "numpy==1.17.3; python_version=='3.7' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'", - "numpy==1.18.3; python_version=='3.8' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'", - "numpy==1.19.3; python_version=='3.9' and (platform_machine!='arm64' or platform_system!='Darwin')", - # Aarch64(Python 3.9 requirements are the same as AMD64) - "numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64'", - "numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'", - # Darwin Arm64 - "numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'", - "numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'", - # For Python versions which aren't yet officially supported, - # we specify an unpinned NumPy which allows source distributions - # to be used and allows wheels to be used as soon as they - # become available. - "numpy==1.21.2; python_version=='3.10'", - "numpy; python_version>'3.10'", - "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'", + "oldest-supported-numpy>=0.10" ] # uncomment to enable pep517 after versioneer problem is fixed. # https://github.com/python-versioneer/python-versioneer/issues/193 From 4f406e5a5cfd9dbe375b98af4352a11778229af4 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:51:37 -0700 Subject: [PATCH 07/36] Update actions-38-db-min.yaml --- ci/deps/actions-38-db-min.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-db-min.yaml b/ci/deps/actions-38-db-min.yaml index c93f791b7dba7..a45e3919afd69 100644 --- a/ci/deps/actions-38-db-min.yaml +++ b/ci/deps/actions-38-db-min.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From c5d3021570821c270ce6008fbe4a6ef3c3143a85 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:51:52 -0700 Subject: [PATCH 08/36] Update actions-38-minimum_versions.yaml --- ci/deps/actions-38-minimum_versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index d666bc3b555f5..cdcb598ccc566 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8.0 # tools - - cython=0.29.21 + - cython=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From 1b043b61c044a0b398555c7bbf0a0de816b1a5a2 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:52:10 -0700 Subject: [PATCH 09/36] Update actions-38-locale.yaml --- ci/deps/actions-38-locale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-locale.yaml b/ci/deps/actions-38-locale.yaml index 46ebaadc3049a..13b132109effb 100644 --- a/ci/deps/actions-38-locale.yaml +++ b/ci/deps/actions-38-locale.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From 1ec533f64959adcf500b6d2911134948c30c672b Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:52:34 -0700 Subject: [PATCH 10/36] Update actions-38-db.yaml --- ci/deps/actions-38-db.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-db.yaml b/ci/deps/actions-38-db.yaml index b4495fa6887f4..6dd96f300eb3e 100644 --- a/ci/deps/actions-38-db.yaml +++ b/ci/deps/actions-38-db.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-xdist>=1.31 - hypothesis>=5.5.3 From 5764d02dab3fcbde521cf64782287d5fcc8b8b64 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:52:59 -0700 Subject: [PATCH 11/36] Update actions-38-slow.yaml --- ci/deps/actions-38-slow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-slow.yaml b/ci/deps/actions-38-slow.yaml index 08900a31fe27c..ef67b983fc897 100644 --- a/ci/deps/actions-38-slow.yaml +++ b/ci/deps/actions-38-slow.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From a68c546e4b06d89716ebe1efdfd7a0d8464cd8c7 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:53:26 -0700 Subject: [PATCH 12/36] Update actions-38-locale_slow.yaml --- ci/deps/actions-38-locale_slow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-locale_slow.yaml b/ci/deps/actions-38-locale_slow.yaml index e7276027f2a41..0ff5dd6c3f7f0 100644 --- a/ci/deps/actions-38-locale_slow.yaml +++ b/ci/deps/actions-38-locale_slow.yaml @@ -6,7 +6,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From 7d3dd4c318eac8ab6162fc55e251870cc18a3dc2 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:53:42 -0700 Subject: [PATCH 13/36] Update actions-38.yaml --- ci/deps/actions-38.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 86b038ff7d4b6..899913d6e8c70 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -6,7 +6,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From e1745d656de48529df2f71a6fec0ccf3ceee201a Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:54:00 -0700 Subject: [PATCH 14/36] Update actions-39-slow.yaml --- ci/deps/actions-39-slow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-39-slow.yaml b/ci/deps/actions-39-slow.yaml index dbfcf98a3203b..4ecae3a167713 100644 --- a/ci/deps/actions-39-slow.yaml +++ b/ci/deps/actions-39-slow.yaml @@ -6,7 +6,7 @@ dependencies: - python=3.9 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From 94ea941110a3d291366c635526688df628b04699 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:54:21 -0700 Subject: [PATCH 15/36] Update actions-39-numpydev.yaml --- ci/deps/actions-39-numpydev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-39-numpydev.yaml b/ci/deps/actions-39-numpydev.yaml index 03181a9d71d1d..4a6acf55e265f 100644 --- a/ci/deps/actions-39-numpydev.yaml +++ b/ci/deps/actions-39-numpydev.yaml @@ -15,7 +15,7 @@ dependencies: - pytz - pip - pip: - - cython==0.29.21 # GH#34014 + - cython==0.29.24 # GH#34014 - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple" - "--pre" - "numpy" From 9c12e9cb4a497687ba4fb8c4326822bd3f22ef80 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:54:41 -0700 Subject: [PATCH 16/36] Update actions-39.yaml --- ci/deps/actions-39.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index a78fb30019b53..44f0124778e15 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.9 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 From 1b686d506d9c89430564cce3201deedafcb33567 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:55:00 -0700 Subject: [PATCH 17/36] Update azure-macos-38.yaml --- ci/deps/azure-macos-38.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/azure-macos-38.yaml b/ci/deps/azure-macos-38.yaml index 029d088362aa9..27bfb136005c1 100644 --- a/ci/deps/azure-macos-38.yaml +++ b/ci/deps/azure-macos-38.yaml @@ -32,6 +32,6 @@ dependencies: - xlwt - pip - pip: - - cython>=0.29.21 + - cython>=0.29.24 - pyreadstat - pyxlsb From 23046158f8164c35c5b53f6669c14998e13ff428 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:55:14 -0700 Subject: [PATCH 18/36] Update azure-windows-38.yaml --- ci/deps/azure-windows-38.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml index c56496bce7d6c..53c46ea967499 100644 --- a/ci/deps/azure-windows-38.yaml +++ b/ci/deps/azure-windows-38.yaml @@ -6,7 +6,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-xdist>=1.31 - hypothesis>=5.5.3 From 5daaf279312b6d6a1fa590c04e8cdc18df92b5fe Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:55:30 -0700 Subject: [PATCH 19/36] Update azure-windows-39.yaml --- ci/deps/azure-windows-39.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/azure-windows-39.yaml b/ci/deps/azure-windows-39.yaml index c4d376fd2a909..1ed6c8d5b9810 100644 --- a/ci/deps/azure-windows-39.yaml +++ b/ci/deps/azure-windows-39.yaml @@ -6,7 +6,7 @@ dependencies: - python=3.9 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-xdist>=1.31 - hypothesis>=5.5.3 From 435e9b113ec53d566876a8700f6ac24018879c47 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:55:47 -0700 Subject: [PATCH 20/36] Update circle-38-arm64.yaml --- ci/deps/circle-38-arm64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index 17fe5b4b7b77b..6627ed5073b46 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8 # tools - - cython>=0.29.21 + - cython>=0.29.24 - pytest>=6.0 - pytest-xdist>=1.31 - hypothesis>=5.5.3 From 79819cace47185a5a833c945e348aac4a6459db8 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 24 Sep 2021 17:16:40 -0700 Subject: [PATCH 21/36] Update action.yml --- .github/actions/build_pandas/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index d4777bcd1d079..2e4bfea165316 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -13,5 +13,5 @@ runs: - name: Build Pandas run: | python setup.py build_ext -j 2 - python -m pip install -e . --no-build-isolation --no-use-pep517 + python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index shell: bash -l {0} From 9533da5c909e981aebc3b1b6c73c644474156f9a Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:27:10 -0700 Subject: [PATCH 22/36] Update setup.cfg --- setup.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 0882e4f724099..0a2604b8dcc09 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,10 @@ project_urls = [options] packages = find: install_requires = - numpy>=1.18.5 + numpy>=1.18.5; platform_machine!='aarch64' and platform_machine!='arm64' and python_version<'3.10' + numpy>=1.19.2; platform_machine=='aarch64' + numpy>=1.20.0; platform_machine=='arm64' + numpy>=1.21.0; python_version=='3.10' python-dateutil>=2.8.1 pytz>=2020.1 python_requires = >=3.8 From 692ca3a5a7459b6fa13a8bb68a24a0c4b651d2ce Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:58:35 -0700 Subject: [PATCH 23/36] Update sdist.yml --- .github/workflows/sdist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 2e890506073a8..7884e617f15a3 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9"] + python-version: ["3.8", "3.9", "3.10-dev"] concurrency: group: ${{github.ref}}-${{matrix.python-version}}-sdist cancel-in-progress: ${{github.event_name == 'pull_request'}} From 7cd2152e724d8439fa250636ed84f0e7f764bc97 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 30 Sep 2021 07:07:21 -0700 Subject: [PATCH 24/36] Update sdist.yml --- .github/workflows/sdist.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 7884e617f15a3..d8be3d6bba792 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -49,15 +49,20 @@ jobs: run: | pip list python setup.py sdist --formats=gztar + # Remove numpy for clean env for python 3.10 + # Unneeded after conda-forge adds python 3.10 + pip uninstall numpy - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-sdist python-version: ${{ matrix.python-version }} + # TODO: Remove after conda-forge adds python 3.10 + if: ${{ matrix.python-version != "3.10-dev" }} - name: Install pandas from sdist run: | - conda list + pip list python -m pip install dist/*.gz - name: Import pandas From 43316c3d4bac2ff5a04f36765b493de6445d4b6f Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 30 Sep 2021 07:23:04 -0700 Subject: [PATCH 25/36] Update sdist.yml --- .github/workflows/sdist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index d8be3d6bba792..aec6e03307564 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -58,7 +58,7 @@ jobs: activate-environment: pandas-sdist python-version: ${{ matrix.python-version }} # TODO: Remove after conda-forge adds python 3.10 - if: ${{ matrix.python-version != "3.10-dev" }} + if: ${{ matrix.python-version != '3.10-dev' }} - name: Install pandas from sdist run: | From 6288e9ee81b64f9ab17f81827d2c9290729927b8 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:44:49 -0700 Subject: [PATCH 26/36] Update sdist.yml --- .github/workflows/sdist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index aec6e03307564..aa0195c4422f6 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -51,7 +51,7 @@ jobs: python setup.py sdist --formats=gztar # Remove numpy for clean env for python 3.10 # Unneeded after conda-forge adds python 3.10 - pip uninstall numpy + pip uninstall -y numpy - uses: conda-incubator/setup-miniconda@v2 with: From a8fcee5ae73d43d8234dfbc0e57a0feddac799a4 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 4 Oct 2021 20:42:20 -0700 Subject: [PATCH 27/36] Update v1.4.0.rst --- doc/source/whatsnew/v1.4.0.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/source/whatsnew/v1.4.0.rst b/doc/source/whatsnew/v1.4.0.rst index 51c6b297a37cb..d2a6028ed33d8 100644 --- a/doc/source/whatsnew/v1.4.0.rst +++ b/doc/source/whatsnew/v1.4.0.rst @@ -281,6 +281,12 @@ Other API changes - :meth:`Index.get_indexer_for` no longer accepts keyword arguments (other than 'target'); in the past these would be silently ignored if the index was not unique (:issue:`42310`) - +.. _whatsnew_130.api_breaking.build: + +Build +^^^^^ +- The minimum version of Cython needed to compile pandas is now ``0.29.24`` (:issue:`43729`) + .. --------------------------------------------------------------------------- .. _whatsnew_140.deprecations: From af883e58eef7166cbfbe1494a1e13cd8d590fba8 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 5 Oct 2021 07:08:45 -0700 Subject: [PATCH 28/36] typo --- doc/source/whatsnew/v1.4.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v1.4.0.rst b/doc/source/whatsnew/v1.4.0.rst index d2a6028ed33d8..e224edc3a7850 100644 --- a/doc/source/whatsnew/v1.4.0.rst +++ b/doc/source/whatsnew/v1.4.0.rst @@ -281,7 +281,7 @@ Other API changes - :meth:`Index.get_indexer_for` no longer accepts keyword arguments (other than 'target'); in the past these would be silently ignored if the index was not unique (:issue:`42310`) - -.. _whatsnew_130.api_breaking.build: +.. _whatsnew_140.api_breaking.build: Build ^^^^^ From 5c30ced3c10e31f49acdc8b397cd2731a28f1c1a Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 5 Oct 2021 16:59:11 -0700 Subject: [PATCH 29/36] Update sdist.yml --- .github/workflows/sdist.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index aa0195c4422f6..45bff4fd776e5 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10-dev"] + python-version: ["3.8", "3.9", "3.10"] concurrency: group: ${{github.ref}}-${{matrix.python-version}}-sdist cancel-in-progress: ${{github.event_name == 'pull_request'}} @@ -49,16 +49,11 @@ jobs: run: | pip list python setup.py sdist --formats=gztar - # Remove numpy for clean env for python 3.10 - # Unneeded after conda-forge adds python 3.10 - pip uninstall -y numpy - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-sdist python-version: ${{ matrix.python-version }} - # TODO: Remove after conda-forge adds python 3.10 - if: ${{ matrix.python-version != '3.10-dev' }} - name: Install pandas from sdist run: | From cbcee658e1f779c06f9a94988b287ea22e374043 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 5 Oct 2021 17:03:40 -0700 Subject: [PATCH 30/36] Update sdist.yml --- .github/workflows/sdist.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 45bff4fd776e5..04bd3f75ad55b 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -54,6 +54,7 @@ jobs: with: activate-environment: pandas-sdist python-version: ${{ matrix.python-version }} + channels: conda-forge - name: Install pandas from sdist run: | From 2f9f466379df78e2f09e0633a70cbabe8d753f6b Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 8 Oct 2021 19:48:36 -0700 Subject: [PATCH 31/36] Update sdist.yml --- .github/workflows/sdist.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 04bd3f75ad55b..88df6ced308c5 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -53,8 +53,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-sdist - python-version: ${{ matrix.python-version }} - channels: conda-forge + python-version: '${{ matrix.python-version }}' - name: Install pandas from sdist run: | From 33178c47713662206dd50668faa9708d486d07b3 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 11 Oct 2021 15:32:49 -0700 Subject: [PATCH 32/36] Update sdist.yml --- .github/workflows/sdist.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 88df6ced308c5..80e9264f294d4 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -59,6 +59,17 @@ jobs: run: | pip list python -m pip install dist/*.gz + + - name: Force oldest supported NumPy + run: | + case "${{matrix.python-version}}" in + 3.8) + pip install numpy==1.17.3 ;; + 3.9) + pip install numpy==1.19.3 ;; + 3.10) + pip install numpy==1.21.2 ;; + esac - name: Import pandas run: | From 58f2d36a30bc0d152680ec3eaa5a6cb8efcfafcb Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 11 Oct 2021 15:32:49 -0700 Subject: [PATCH 33/36] Update sdist.yml Co-authored-by: lithomas1 Co-authored-by: henryiii --- .github/workflows/sdist.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 88df6ced308c5..80e9264f294d4 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -59,6 +59,17 @@ jobs: run: | pip list python -m pip install dist/*.gz + + - name: Force oldest supported NumPy + run: | + case "${{matrix.python-version}}" in + 3.8) + pip install numpy==1.17.3 ;; + 3.9) + pip install numpy==1.19.3 ;; + 3.10) + pip install numpy==1.21.2 ;; + esac - name: Import pandas run: | From 6dcafea71613ffa50dafd98035e5d9575271165a Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 11 Oct 2021 15:56:28 -0700 Subject: [PATCH 34/36] Update sdist.yml --- .github/workflows/sdist.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 80e9264f294d4..7692dc522522f 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -59,12 +59,12 @@ jobs: run: | pip list python -m pip install dist/*.gz - + - name: Force oldest supported NumPy run: | case "${{matrix.python-version}}" in 3.8) - pip install numpy==1.17.3 ;; + pip install numpy==1.18.5 ;; 3.9) pip install numpy==1.19.3 ;; 3.10) From 8cf70dd6817ae98bbe6c1186f1e16379d09b252a Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 11 Oct 2021 19:05:18 -0700 Subject: [PATCH 35/36] Update setup.cfg --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 0a2604b8dcc09..9deebb835eff7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,9 +32,9 @@ project_urls = packages = find: install_requires = numpy>=1.18.5; platform_machine!='aarch64' and platform_machine!='arm64' and python_version<'3.10' - numpy>=1.19.2; platform_machine=='aarch64' - numpy>=1.20.0; platform_machine=='arm64' - numpy>=1.21.0; python_version=='3.10' + numpy>=1.19.2; platform_machine=='aarch64' and python_version<'3.10' + numpy>=1.20.0; platform_machine=='arm64' and python_version<'3.10' + numpy>=1.21.0; python_version>='3.10' python-dateutil>=2.8.1 pytz>=2020.1 python_requires = >=3.8 From 542c5def2d8e8799cc33dc07b73a1ccc8c2135fb Mon Sep 17 00:00:00 2001 From: Thomas Li Date: Tue, 12 Oct 2021 19:52:27 -0700 Subject: [PATCH 36/36] move whatsnew --- doc/source/whatsnew/v1.3.4.rst | 2 +- doc/source/whatsnew/v1.4.0.rst | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/source/whatsnew/v1.3.4.rst b/doc/source/whatsnew/v1.3.4.rst index 6f07dc3e1e2f9..963aaa7f9189f 100644 --- a/doc/source/whatsnew/v1.3.4.rst +++ b/doc/source/whatsnew/v1.3.4.rst @@ -42,7 +42,7 @@ Bug fixes Other ~~~~~ -- +- The minimum version of Cython needed to compile pandas is now ``0.29.24`` (:issue:`43729`) - .. --------------------------------------------------------------------------- diff --git a/doc/source/whatsnew/v1.4.0.rst b/doc/source/whatsnew/v1.4.0.rst index d757639416d02..a3dc95781ee93 100644 --- a/doc/source/whatsnew/v1.4.0.rst +++ b/doc/source/whatsnew/v1.4.0.rst @@ -283,12 +283,6 @@ Other API changes - :meth:`Index.get_indexer_for` no longer accepts keyword arguments (other than 'target'); in the past these would be silently ignored if the index was not unique (:issue:`42310`) - -.. _whatsnew_140.api_breaking.build: - -Build -^^^^^ -- The minimum version of Cython needed to compile pandas is now ``0.29.24`` (:issue:`43729`) - .. --------------------------------------------------------------------------- .. _whatsnew_140.deprecations: