From c3ffda02dd533919a733825001f958273ce39abc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 18 Apr 2022 06:03:52 +0000 Subject: [PATCH 1/4] Rebuild for PyPy3.8 and PyPy3.9 --- .ci_support/migrations/pypy38.yaml | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .ci_support/migrations/pypy38.yaml diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml new file mode 100644 index 000000000..95e054260 --- /dev/null +++ b/.ci_support/migrations/pypy38.yaml @@ -0,0 +1,53 @@ +migrator_ts: 1647123563 +__migrator: + migration_number: 1 + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: False + longterm: True + use_local: False + check_solvable: True + exclude_pinned_pkgs: False + pr_limit: 10 + bump_number: 1 + wait_for_migrators: + - python310 + commit_message: "Rebuild for PyPy3.8 and PyPy3.9" + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + +python: + - 3.7.* *_cpython # [not (osx and arm64)] + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.8.* *_73_pypy # [not (osx and arm64)] + - 3.9.* *_73_pypy # [not (osx and arm64)] +numpy: + # part of a zip_keys: python, python_impl, numpy + - 1.19 # [not (osx and arm64)] + - 1.19 + - 1.19 + - 1.21 + - 1.19 # [not (osx and arm64)] + - 1.19 # [not (osx and arm64)] +python_impl: + - cpython # [not (osx and arm64)] + - cpython + - cpython + - cpython + - pypy # [not (osx and arm64)] + - pypy # [not (osx and arm64)] From 51c7a57e1c3c6db880fa4ec55368553fd6d57429 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 9 Oct 2023 11:34:18 +1100 Subject: [PATCH 2/4] don't use optional test-deps that are not available for pypy --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 111328b16..72793d87f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -767,7 +767,7 @@ outputs: - cffi - cloudpickle - cython - - fastparquet + - fastparquet # [python_impl == "cpython"] - fsspec - hypothesis - minio-server From 42b90325f42c01888318f59ddfd9a80b8ce79c11 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 9 Oct 2023 12:07:02 +1100 Subject: [PATCH 3/4] DEBUG: build only pypy; verbose test suite --- recipe/meta.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 72793d87f..6d0c5e4fa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -621,6 +621,8 @@ outputs: script: build-pyarrow.bat # [win] version: {{ version }} build: + # debug: only pypy + skip: true # [python_impl != "pypy"] string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} ignore_run_exports_from: - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] @@ -719,6 +721,8 @@ outputs: script: build-pyarrow.bat # [win] version: {{ version }} build: + # debug: only pypy + skip: true # [python_impl != "pypy"] string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} ignore_run_exports_from: - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] @@ -752,7 +756,7 @@ outputs: run_constrained: - apache-arrow-proc =*={{ build_ext }} - {% if not (aarch64 or ppc64le) or py == 311 %} + {% if not (aarch64 or ppc64le) or py == 39 %} # only run the full test suite for one python version when in emulation # (each run can take up to ~45min); there's essentially zero divergence # in behaviour across python versions anyway @@ -817,7 +821,7 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_safe_cast_from_float_with_nans_to_int" %} # [ppc64le] {% set tests_to_skip = tests_to_skip + " or test_float_with_null_as_integer" %} # [ppc64le] # ^^^^^^^ TESTS THAT SHOULDN'T HAVE TO BE SKIPPED ^^^^^^^ - - pytest pyarrow/ -rfEs -k "not ({{ tests_to_skip }})" + - pytest pyarrow/ -rfEs -k "not ({{ tests_to_skip }})" -v {% endif %} about: From e995c5a9bac97efcbabb8db8e91de3fd1cfcff33 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 Nov 2023 14:02:52 +1100 Subject: [PATCH 4/4] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and conda-forge-pinning 2023.11.15.00.22.50 --- .azure-pipelines/azure-pipelines-win.yml | 8 ++++---- ...iler_version11.2cxx_compiler_version10.yaml | 10 ++++++++++ ...iler_versionNonecxx_compiler_version12.yaml | 10 ++++++++++ ...iler_version11.2cxx_compiler_version10.yaml | 10 ++++++++++ ...iler_versionNonecxx_compiler_version12.yaml | 10 ++++++++++ ...iler_version11.2cxx_compiler_version10.yaml | 10 ++++++++++ ...iler_versionNonecxx_compiler_version12.yaml | 10 ++++++++++ .ci_support/osx_64_.yaml | 10 ++++++++++ .ci_support/osx_arm64_.yaml | 18 ------------------ ...l => win_64_cuda_compiler_version11.2.yaml} | 10 ++++++++++ ...l => win_64_cuda_compiler_versionNone.yaml} | 10 ++++++++++ README.md | 8 ++++---- 12 files changed, 98 insertions(+), 26 deletions(-) rename .ci_support/{win_64_cuda_compilernvcccuda_compiler_version11.2.yaml => win_64_cuda_compiler_version11.2.yaml} (88%) rename .ci_support/{win_64_cuda_compilerNonecuda_compiler_versionNone.yaml => win_64_cuda_compiler_versionNone.yaml} (88%) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f57e6cad1..c12db6fb2 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.2: + CONFIG: win_64_cuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.2: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.2 + win_64_cuda_compiler_versionNone: + CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 55675e162..6e1fa73f6 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -46,6 +46,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -59,7 +60,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -81,6 +90,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 2a95aad28..74cccbcb5 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -46,6 +46,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -59,7 +60,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -81,6 +90,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml index a3c98e3e0..df40d4eca 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -50,6 +50,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -63,7 +64,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -85,6 +94,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml index e032f4f1c..379f634d2 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -50,6 +50,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -63,7 +64,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -85,6 +94,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml index 3032220b5..3fce997b5 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -46,6 +46,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -59,7 +60,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -81,6 +90,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml index dae9a0040..e0c69cd48 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -46,6 +46,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -59,7 +60,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -81,6 +90,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index de230aff3..6d35326dd 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -42,6 +42,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -55,7 +56,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -71,6 +80,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 5ee31e96c..5bae98eb7 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -36,26 +36,10 @@ lz4_c: - 1.9.3 macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' -- '1.22' openssl: - '3' orc: - 1.9.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython re2: - 2023.06.02 snappy: @@ -69,8 +53,6 @@ zip_keys: - cxx_compiler_version - - libgrpc - libprotobuf -- - python - - numpy zlib: - '1.2' zstd: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml similarity index 88% rename from .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml rename to .ci_support/win_64_cuda_compiler_version11.2.yaml index 86b4c5025..179fad0b2 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -42,6 +42,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -55,7 +56,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -71,6 +80,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml similarity index 88% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compiler_versionNone.yaml index 30cb58ab6..2cfc0033f 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -42,6 +42,7 @@ numpy: - '1.26' - '1.22' - '1.22' +- '1.22' openssl: - '3' orc: @@ -55,7 +56,15 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython +python_impl: +- cpython +- cpython +- cpython +- cpython +- pypy +- cpython re2: - 2023.06.02 snappy: @@ -71,6 +80,7 @@ zip_keys: - libprotobuf - - python - numpy + - python_impl zlib: - '1.2' zstd: diff --git a/README.md b/README.md index 46f56e54f..b0c4018df 100644 --- a/README.md +++ b/README.md @@ -195,17 +195,17 @@ Current build status - win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.2 - variant + variant - win_64_cuda_compilernvcccuda_compiler_version11.2 + win_64_cuda_compiler_versionNone - variant + variant