ARROW-12246: [CI] Sync conda recipes with upstream feedstock #9923

jorisvandenbossche · 2021-04-07T10:41:37Z

(I am first trying with linux)

jorisvandenbossche · 2021-04-07T10:42:29Z

@github-actions crossbow submit -g conda

github-actions · 2021-04-07T11:12:13Z

https://issues.apache.org/jira/browse/ARROW-12246

github-actions · 2021-04-07T11:18:28Z

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233

Submitted crossbow builds: ursacomputing/crossbow @ actions-275

Task	Status
conda-clean
conda-linux-gcc-py36-aarch64
conda-linux-gcc-py36-cpu-r36
conda-linux-gcc-py36-cuda
conda-linux-gcc-py37-aarch64
conda-linux-gcc-py37-cpu-r40
conda-linux-gcc-py37-cuda
conda-linux-gcc-py38-aarch64
conda-linux-gcc-py38-cpu
conda-linux-gcc-py38-cuda
conda-linux-gcc-py39-aarch64
conda-linux-gcc-py39-cpu
conda-linux-gcc-py39-cuda
conda-osx-clang-py36-r36
conda-osx-clang-py37-r40
conda-osx-clang-py38
conda-osx-clang-py39
conda-win-vs2017-py36-r36
conda-win-vs2017-py37-r40
conda-win-vs2017-py38

jorisvandenbossche · 2021-04-07T11:52:36Z

@github-actions crossbow submit conda-linux-gcc-py38-cpu

github-actions · 2021-04-07T12:30:51Z

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad

Submitted crossbow builds: ursacomputing/crossbow @ actions-276

Task	Status
conda-linux-gcc-py38-cpu

xhochy · 2021-04-08T08:15:29Z

@github-actions crossbow submit conda-linux-gcc-py38-cpu

github-actions · 2021-04-08T08:17:15Z

Revision: 985951ee3eff85a713d4518441715a5732803ae0

Submitted crossbow builds: ursacomputing/crossbow @ actions-284

Task	Status
conda-linux-gcc-py38-cpu

jorisvandenbossche · 2021-04-08T08:22:15Z

I suppose that in the past we made some adjustments to the build scripts (run_docker_build.sh) after copying them from upstream conda-forge, to make it work here? (cc @kszucs)
If that's the case, it would be good to better document that / more clearly separate those changes (so they can be applied later again).

jorisvandenbossche · 2021-04-08T08:29:26Z

Eg #4649 has some changes to that file after the initial commit adding it: https://github.com/apache/arrow/pull/4649/files/2037f78fc8a5842a123930656afe73f7a1e25cbb..20f6cecd3e8a8e476387a6441d6572ff94fa6e5f#diff-7ad035b7e05f08778571fe6908954a873b6ca24fe661324cb9d1a29c7c4e505b

xhochy · 2021-04-08T09:43:29Z

@jorisvandenbossche I would revert the changes to dev/tasks/conda-recipes/{run_docker_build.sh,build_steps.sh} and put a comment at the top that we did modify them manually. We shouldn't need to update them. Also I would have a bit of time today to finish this PR, ok if I take this over from you?

jorisvandenbossche · 2021-04-08T09:47:09Z

ok if I take this over from you?

Sure!

xhochy · 2021-04-08T10:30:19Z

@github-actions crossbow submit conda-linux-gcc-py38-cpu

kszucs · 2021-04-08T10:32:39Z

Note that I have a large undertaking for crossbow #9913 which I plan to merge today, so expect for some minor conflicts.

@xhochy Just an idea: could we clone the upstream conda-forge repository in the crossbow task instead of vendoring the files? We would need to vendor a couple of fines to enable us introducing modifying dependencies, but this approach could help to keep the setup in sync with the feedstock.

xhochy · 2021-04-08T10:36:13Z

Note that I have a large undertaking for crossbow #9913 which I plan to merge today, so expect for some minor conflicts.

I don't see any conflicting things here, so I would hope that a rebase here will work out fine. Thanks for the heads-up 👍

@xhochy Just an idea: could we clone the upstream conda-forge repository in the crossbow task instead of vendoring the files? We would need to vendor a couple of fines to enable us introducing modifying dependencies, but this approach could help to keep the setup in sync with the feedstock.

Yes, that could be part of a future solution. I'm currently struggling a bit with it though as the number of possible conda configurations varies on conda-forge and the names of the files in .ci_support changes quite often. Furthermore, it would be nice to have a libarrow recipe that is the base for both the Python and R packages but doesn't depend on Python. This would need a bit more of a restructuring inside the arrow codebase.

github-actions · 2021-04-08T11:57:05Z

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16

Submitted crossbow builds: ursacomputing/crossbow @ actions-291

Task	Status
conda-linux-gcc-py38-cpu

xhochy · 2021-04-08T15:39:50Z

@github-actions crossbow submit -g conda

github-actions · 2021-04-08T19:54:56Z

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c

Submitted crossbow builds: ursacomputing/crossbow @ actions-298

Task	Status
conda-clean
conda-linux-gcc-py36-aarch64
conda-linux-gcc-py36-cpu-r36
conda-linux-gcc-py36-cuda
conda-linux-gcc-py37-aarch64
conda-linux-gcc-py37-cpu-r40
conda-linux-gcc-py37-cuda
conda-linux-gcc-py38-aarch64
conda-linux-gcc-py38-cpu
conda-linux-gcc-py38-cuda
conda-linux-gcc-py39-aarch64
conda-linux-gcc-py39-cpu
conda-linux-gcc-py39-cuda
conda-osx-arm64-clang-py38
conda-osx-arm64-clang-py39
conda-osx-clang-py36-r36
conda-osx-clang-py37-r40
conda-osx-clang-py38
conda-osx-clang-py39
conda-win-vs2017-py36-r36
conda-win-vs2017-py37-r40
conda-win-vs2017-py38

xhochy · 2021-04-09T11:19:00Z

@github-actions crossbow submit conda-win-*

github-actions · 2021-04-09T11:21:13Z

Revision: 989900a7c56a05826195d18462e8fa79511d8e31

Submitted crossbow builds: ursacomputing/crossbow @ actions-301

Task	Status
conda-win-vs2017-py36-r36
conda-win-vs2017-py37-r40
conda-win-vs2017-py38
conda-win-vs2017-py39

xhochy · 2021-04-09T11:30:07Z

@jorisvandenbossche @kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.

xhochy · 2021-04-09T11:31:16Z

One of the Windows builds progressed so far on my crossbow that I'm confident that the rest will also be green in ~1h: https://dev.azure.com/mail0406/crossbow/_build/results?buildId=26&view=logs&j=4c86bc1b-1091-5192-4404-c74dfaad23e7&t=41795ef0-6501-5db4-3ad4-33c0cf085626

xhochy · 2021-04-12T13:01:49Z

@github-actions crossbow submit -g conda

github-actions · 2021-04-12T16:18:58Z

Revision: f337001

Submitted crossbow builds: ursacomputing/crossbow @ actions-310

Task	Status
conda-clean
conda-linux-gcc-py36-arm64
conda-linux-gcc-py36-cpu-r36
conda-linux-gcc-py36-cuda
conda-linux-gcc-py37-arm64
conda-linux-gcc-py37-cpu-r40
conda-linux-gcc-py37-cuda
conda-linux-gcc-py38-arm64
conda-linux-gcc-py38-cpu
conda-linux-gcc-py38-cuda
conda-linux-gcc-py39-arm64
conda-linux-gcc-py39-cpu
conda-linux-gcc-py39-cuda
conda-osx-arm64-clang-py38
conda-osx-arm64-clang-py39
conda-osx-clang-py36-r36
conda-osx-clang-py37-r40
conda-osx-clang-py38
conda-osx-clang-py39
conda-win-vs2017-py36-r36
conda-win-vs2017-py37-r40
conda-win-vs2017-py38
conda-win-vs2017-py39

jorisvandenbossche

Thanks for finishing this! Assuming the builds pass, this is all good for me.
I just added two suggestions of adding some more comments for our future selves (I commented on a subset of the diff, to see the changes after updating with the upstream version, but could be I was looking at wrong changes;)).

jorisvandenbossche · 2021-04-12T17:48:30Z

dev/tasks/conda-recipes/arrow-cpp/bld-pyarrow.bat

-copy /Y "%SRC_DIR%\cpp\cmake_modules\CompilerInfo.cmake" cmake_modules\
-copy /Y "%SRC_DIR%\cpp\cmake_modules\FindNumPy.cmake" cmake_modules\
-copy /Y "%SRC_DIR%\cpp\cmake_modules\FindPythonLibsNew.cmake" cmake_modules\
+@rem del cmake_modules\BuildUtils.cmake


Worth adding a comment that those are commented out compared to the upstream conda-forge build script?

jorisvandenbossche · 2021-04-12T17:49:20Z

dev/tasks/conda-recipes/arrow-cpp/meta.yaml

@@ -1,6 +1,6 @@
-{% set version = "3.0.0" %}
+{% set version = ARROW_VERSION %}


Maybe can add a comment here indicating that setting this to ARROW_VERSION is a difference compared to the upstream version?

jorisvandenbossche and others added 9 commits April 12, 2021 15:00

ARROW-12246: [CI] Sync conda recipes with upstream feedstock

2e8f996

add logging_utils script

f1fb2e5

update recipe as well

f9b2a21

Revert changes to build scripts

b4973fb

Use ARROW_VERSION again

24517fd

Use source: ......

cae64e5

Update OSX builds

0294889

Don't build parquet-cpp anymore

e32cecb

Revert commented Windows commands

44a0005

Update Windows variants

f337001

xhochy force-pushed the ARROW-12246-conda-recipes branch from 989900a to f337001 Compare April 12, 2021 13:01

jorisvandenbossche commented Apr 12, 2021

View reviewed changes

Add comments about difference to conda-forge

a60a8db

xhochy closed this in c394a20 Apr 15, 2021

jorisvandenbossche deleted the ARROW-12246-conda-recipes branch June 2, 2022 09:44

asfimport mentioned this pull request Apr 15, 2021

[CI] Sync conda recipes with upstream feedstock #28058

Closed

		@@ -1,6 +1,6 @@
		{% set version = "3.0.0" %}
		{% set version = ARROW_VERSION %}

ARROW-12246: [CI] Sync conda recipes with upstream feedstock #9923

ARROW-12246: [CI] Sync conda recipes with upstream feedstock #9923

Uh oh!

Conversation

jorisvandenbossche commented Apr 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jorisvandenbossche commented Apr 7, 2021

Uh oh!

github-actions bot commented Apr 7, 2021

Uh oh!

github-actions bot commented Apr 7, 2021

Uh oh!

jorisvandenbossche commented Apr 7, 2021

Uh oh!

github-actions bot commented Apr 7, 2021

Uh oh!

xhochy commented Apr 8, 2021

Uh oh!

github-actions bot commented Apr 8, 2021

Uh oh!

jorisvandenbossche commented Apr 8, 2021

Uh oh!

jorisvandenbossche commented Apr 8, 2021

Uh oh!

xhochy commented Apr 8, 2021

Uh oh!

jorisvandenbossche commented Apr 8, 2021

Uh oh!

xhochy commented Apr 8, 2021

Uh oh!

kszucs commented Apr 8, 2021

Uh oh!

xhochy commented Apr 8, 2021

Uh oh!

github-actions bot commented Apr 8, 2021

Uh oh!

xhochy commented Apr 8, 2021

Uh oh!

github-actions bot commented Apr 8, 2021

Uh oh!

xhochy commented Apr 9, 2021

Uh oh!

github-actions bot commented Apr 9, 2021

Uh oh!

xhochy commented Apr 9, 2021

Uh oh!

xhochy commented Apr 9, 2021

Uh oh!

xhochy commented Apr 12, 2021

Uh oh!

github-actions bot commented Apr 12, 2021

Uh oh!

jorisvandenbossche left a comment

Choose a reason for hiding this comment

Uh oh!

jorisvandenbossche Apr 12, 2021

Choose a reason for hiding this comment

Uh oh!

jorisvandenbossche Apr 12, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jorisvandenbossche commented Apr 7, 2021 •

edited

Loading