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

Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom
jorisvandenbossche:ARROW-12246-conda-recipes
Closed

ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom
jorisvandenbossche:ARROW-12246-conda-recipes

Conversation

@jorisvandenbossche

@jorisvandenbosschejorisvandenbossche commented Apr 7, 2021•
edited
Loading

Copy link
Copy Markdown
Member

(I am first trying with linux)

@jorisvandenbossche

jorisvandenbossche commented Apr 7, 2021

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g conda

@github-actions

github-actionsBot commented Apr 7, 2021

Copy link
Copy Markdown

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

@github-actions

github-actionsBot commented Apr 7, 2021

Copy link
Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233

Submitted crossbow builds: ursacomputing/crossbow @ actions-275

TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure

@jorisvandenbossche

jorisvandenbossche commented Apr 7, 2021

Copy link
Copy Markdown
MemberAuthor

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

@github-actions

github-actionsBot commented Apr 7, 2021

Copy link
Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad

Submitted crossbow builds: ursacomputing/crossbow @ actions-276

TaskStatus
conda-linux-gcc-py38-cpuAzure

@xhochy

xhochy commented Apr 8, 2021

Copy link
Copy Markdown
Member

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

@github-actions

github-actionsBot commented Apr 8, 2021

Copy link
Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0

Submitted crossbow builds: ursacomputing/crossbow @ actions-284

TaskStatus
conda-linux-gcc-py38-cpuAzure

@jorisvandenbossche

jorisvandenbossche commented Apr 8, 2021

Copy link
Copy Markdown
MemberAuthor

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

jorisvandenbossche commented Apr 8, 2021

Copy link
Copy Markdown
MemberAuthor

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

xhochy commented Apr 8, 2021

Copy link
Copy Markdown
Member

@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

jorisvandenbossche commented Apr 8, 2021

Copy link
Copy Markdown
MemberAuthor

ok if I take this over from you?

Sure!

@xhochy

xhochy commented Apr 8, 2021

Copy link
Copy Markdown
Member

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

@kszucs

kszucs commented Apr 8, 2021

Copy link
Copy Markdown
Member

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

xhochy commented Apr 8, 2021

Copy link
Copy Markdown
Member

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

github-actionsBot commented Apr 8, 2021

Copy link
Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16

Submitted crossbow builds: ursacomputing/crossbow @ actions-291

TaskStatus
conda-linux-gcc-py38-cpuAzure

@xhochy

xhochy commented Apr 8, 2021

Copy link
Copy Markdown
Member

@github-actions crossbow submit -g conda

@github-actions

github-actionsBot commented Apr 8, 2021

Copy link
Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c

Submitted crossbow builds: ursacomputing/crossbow @ actions-298

TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure

@xhochy

xhochy commented Apr 9, 2021

Copy link
Copy Markdown
Member

@github-actions crossbow submit conda-win-*

@github-actions

github-actionsBot commented Apr 9, 2021

Copy link
Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31

Submitted crossbow builds: ursacomputing/crossbow @ actions-301

TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure

@xhochy

xhochy commented Apr 9, 2021

Copy link
Copy Markdown
Member

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

@xhochy

xhochy commented Apr 9, 2021

Copy link
Copy Markdown
Member

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
xhochyforce-pushed the ARROW-12246-conda-recipes branch from 989900a to f337001CompareApril 12, 2021 13:01
@xhochy

xhochy commented Apr 12, 2021

Copy link
Copy Markdown
Member

@github-actions crossbow submit -g conda

@github-actions

github-actionsBot commented Apr 12, 2021

Copy link
Copy Markdown

Revision: f337001

Submitted crossbow builds: ursacomputing/crossbow @ actions-310

TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure

jorisvandenbossche
jorisvandenbossche commented Apr 12, 2021
View reviewed changes

@jorisvandenbosschejorisvandenbossche left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).

Comment threaddev/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

@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}

@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@jorisvandenbossche
jorisvandenbossche deleted the ARROW-12246-conda-recipes branch June 2, 2022 09:44
@asfimportasfimport mentioned this pull request Apr 15, 2021
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-12246: [CI] Sync conda recipes with upstream feedstock - #9923
Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Closed
ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Conversation
@jorisvandenbossche
@jorisvandenbosschejorisvandenbossche
commented
Apr 7, 2021•

edited

Loading

Copy link


Copy Markdown

Member
(I am first trying with linux)
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-12246
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233
Submitted crossbow builds: ursacomputing/crossbow @ actions-275
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad
Submitted crossbow builds: ursacomputing/crossbow @ actions-276
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0
Submitted crossbow builds: ursacomputing/crossbow @ actions-284
TaskStatus
conda-linux-gcc-py38-cpuAzure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
ok if I take this over from you?
Sure!
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@kszucs
kszucs
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16
Submitted crossbow builds: ursacomputing/crossbow @ actions-291
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c
Submitted crossbow builds: ursacomputing/crossbow @ actions-298
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-win-*
@github-actions
github-actionsBot
commented
Apr 9, 2021

Copy link


Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31
Submitted crossbow builds: ursacomputing/crossbow @ actions-301
TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@jorisvandenbossche@kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
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
xhochyforce-pushed
the
ARROW-12246-conda-recipes
branch
from
989900a to
f337001CompareApril 12, 2021 13:01
@xhochy
xhochy
commented
Apr 12, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 12, 2021

Copy link


Copy Markdown

Revision: f337001
Submitted crossbow builds: ursacomputing/crossbow @ actions-310
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
jorisvandenbossche
jorisvandenbossche
commented
Apr 12, 2021
View reviewed changes
@jorisvandenbosschejorisvandenbossche
left a comment


Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).
Comment threaddev/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
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment that those are commented out compared to the upstream conda-forge build script?
Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

ARROW-12246-conda-recipes

branch
June 2, 2022 09:44
@asfimportasfimport
mentioned this pull request
Apr 15, 2021

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12246: [CI] Sync conda recipes with upstream feedstock - #9923
Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Closed
ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Conversation
@jorisvandenbossche
@jorisvandenbosschejorisvandenbossche
commented
Apr 7, 2021•

edited

Loading

Copy link


Copy Markdown

Member
(I am first trying with linux)
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-12246
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233
Submitted crossbow builds: ursacomputing/crossbow @ actions-275
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad
Submitted crossbow builds: ursacomputing/crossbow @ actions-276
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0
Submitted crossbow builds: ursacomputing/crossbow @ actions-284
TaskStatus
conda-linux-gcc-py38-cpuAzure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
ok if I take this over from you?
Sure!
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@kszucs
kszucs
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16
Submitted crossbow builds: ursacomputing/crossbow @ actions-291
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c
Submitted crossbow builds: ursacomputing/crossbow @ actions-298
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-win-*
@github-actions
github-actionsBot
commented
Apr 9, 2021

Copy link


Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31
Submitted crossbow builds: ursacomputing/crossbow @ actions-301
TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@jorisvandenbossche@kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
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
xhochyforce-pushed
the
ARROW-12246-conda-recipes
branch
from
989900a to
f337001CompareApril 12, 2021 13:01
@xhochy
xhochy
commented
Apr 12, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 12, 2021

Copy link


Copy Markdown

Revision: f337001
Submitted crossbow builds: ursacomputing/crossbow @ actions-310
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
jorisvandenbossche
jorisvandenbossche
commented
Apr 12, 2021
View reviewed changes
@jorisvandenbosschejorisvandenbossche
left a comment


Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).
Comment threaddev/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
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment that those are commented out compared to the upstream conda-forge build script?
Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

ARROW-12246-conda-recipes

branch
June 2, 2022 09:44
@asfimportasfimport
mentioned this pull request
Apr 15, 2021

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12246: [CI] Sync conda recipes with upstream feedstock - #9923
Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Closed
ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Conversation
@jorisvandenbossche
@jorisvandenbosschejorisvandenbossche
commented
Apr 7, 2021•

edited

Loading

Copy link


Copy Markdown

Member
(I am first trying with linux)
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-12246
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233
Submitted crossbow builds: ursacomputing/crossbow @ actions-275
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad
Submitted crossbow builds: ursacomputing/crossbow @ actions-276
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0
Submitted crossbow builds: ursacomputing/crossbow @ actions-284
TaskStatus
conda-linux-gcc-py38-cpuAzure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
ok if I take this over from you?
Sure!
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@kszucs
kszucs
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16
Submitted crossbow builds: ursacomputing/crossbow @ actions-291
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c
Submitted crossbow builds: ursacomputing/crossbow @ actions-298
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-win-*
@github-actions
github-actionsBot
commented
Apr 9, 2021

Copy link


Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31
Submitted crossbow builds: ursacomputing/crossbow @ actions-301
TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@jorisvandenbossche@kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
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
xhochyforce-pushed
the
ARROW-12246-conda-recipes
branch
from
989900a to
f337001CompareApril 12, 2021 13:01
@xhochy
xhochy
commented
Apr 12, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 12, 2021

Copy link


Copy Markdown

Revision: f337001
Submitted crossbow builds: ursacomputing/crossbow @ actions-310
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
jorisvandenbossche
jorisvandenbossche
commented
Apr 12, 2021
View reviewed changes
@jorisvandenbosschejorisvandenbossche
left a comment


Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).
Comment threaddev/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
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment that those are commented out compared to the upstream conda-forge build script?
Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

ARROW-12246-conda-recipes

branch
June 2, 2022 09:44
@asfimportasfimport
mentioned this pull request
Apr 15, 2021

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-12246: [CI] Sync conda recipes with upstream feedstock - #9923
Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Closed
ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Conversation
@jorisvandenbossche
@jorisvandenbosschejorisvandenbossche
commented
Apr 7, 2021•

edited

Loading

Copy link


Copy Markdown

Member
(I am first trying with linux)
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-12246
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233
Submitted crossbow builds: ursacomputing/crossbow @ actions-275
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad
Submitted crossbow builds: ursacomputing/crossbow @ actions-276
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0
Submitted crossbow builds: ursacomputing/crossbow @ actions-284
TaskStatus
conda-linux-gcc-py38-cpuAzure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
ok if I take this over from you?
Sure!
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@kszucs
kszucs
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16
Submitted crossbow builds: ursacomputing/crossbow @ actions-291
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c
Submitted crossbow builds: ursacomputing/crossbow @ actions-298
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-win-*
@github-actions
github-actionsBot
commented
Apr 9, 2021

Copy link


Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31
Submitted crossbow builds: ursacomputing/crossbow @ actions-301
TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@jorisvandenbossche@kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
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
xhochyforce-pushed
the
ARROW-12246-conda-recipes
branch
from
989900a to
f337001CompareApril 12, 2021 13:01
@xhochy
xhochy
commented
Apr 12, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 12, 2021

Copy link


Copy Markdown

Revision: f337001
Submitted crossbow builds: ursacomputing/crossbow @ actions-310
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
jorisvandenbossche
jorisvandenbossche
commented
Apr 12, 2021
View reviewed changes
@jorisvandenbosschejorisvandenbossche
left a comment


Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).
Comment threaddev/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
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment that those are commented out compared to the upstream conda-forge build script?
Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

ARROW-12246-conda-recipes

branch
June 2, 2022 09:44
@asfimportasfimport
mentioned this pull request
Apr 15, 2021

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12246: [CI] Sync conda recipes with upstream feedstock - #9923
Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Closed
ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Conversation
@jorisvandenbossche
@jorisvandenbosschejorisvandenbossche
commented
Apr 7, 2021•

edited

Loading

Copy link


Copy Markdown

Member
(I am first trying with linux)
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-12246
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233
Submitted crossbow builds: ursacomputing/crossbow @ actions-275
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad
Submitted crossbow builds: ursacomputing/crossbow @ actions-276
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0
Submitted crossbow builds: ursacomputing/crossbow @ actions-284
TaskStatus
conda-linux-gcc-py38-cpuAzure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
ok if I take this over from you?
Sure!
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@kszucs
kszucs
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16
Submitted crossbow builds: ursacomputing/crossbow @ actions-291
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c
Submitted crossbow builds: ursacomputing/crossbow @ actions-298
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-win-*
@github-actions
github-actionsBot
commented
Apr 9, 2021

Copy link


Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31
Submitted crossbow builds: ursacomputing/crossbow @ actions-301
TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@jorisvandenbossche@kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
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
xhochyforce-pushed
the
ARROW-12246-conda-recipes
branch
from
989900a to
f337001CompareApril 12, 2021 13:01
@xhochy
xhochy
commented
Apr 12, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 12, 2021

Copy link


Copy Markdown

Revision: f337001
Submitted crossbow builds: ursacomputing/crossbow @ actions-310
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
jorisvandenbossche
jorisvandenbossche
commented
Apr 12, 2021
View reviewed changes
@jorisvandenbosschejorisvandenbossche
left a comment


Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).
Comment threaddev/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
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment that those are commented out compared to the upstream conda-forge build script?
Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

ARROW-12246-conda-recipes

branch
June 2, 2022 09:44
@asfimportasfimport
mentioned this pull request
Apr 15, 2021

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12246: [CI] Sync conda recipes with upstream feedstock - #9923
Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Closed
ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Conversation
@jorisvandenbossche
@jorisvandenbosschejorisvandenbossche
commented
Apr 7, 2021•

edited

Loading

Copy link


Copy Markdown

Member
(I am first trying with linux)
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-12246
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233
Submitted crossbow builds: ursacomputing/crossbow @ actions-275
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad
Submitted crossbow builds: ursacomputing/crossbow @ actions-276
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0
Submitted crossbow builds: ursacomputing/crossbow @ actions-284
TaskStatus
conda-linux-gcc-py38-cpuAzure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
ok if I take this over from you?
Sure!
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@kszucs
kszucs
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16
Submitted crossbow builds: ursacomputing/crossbow @ actions-291
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c
Submitted crossbow builds: ursacomputing/crossbow @ actions-298
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-win-*
@github-actions
github-actionsBot
commented
Apr 9, 2021

Copy link


Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31
Submitted crossbow builds: ursacomputing/crossbow @ actions-301
TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@jorisvandenbossche@kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
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
xhochyforce-pushed
the
ARROW-12246-conda-recipes
branch
from
989900a to
f337001CompareApril 12, 2021 13:01
@xhochy
xhochy
commented
Apr 12, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 12, 2021

Copy link


Copy Markdown

Revision: f337001
Submitted crossbow builds: ursacomputing/crossbow @ actions-310
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
jorisvandenbossche
jorisvandenbossche
commented
Apr 12, 2021
View reviewed changes
@jorisvandenbosschejorisvandenbossche
left a comment


Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).
Comment threaddev/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
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment that those are commented out compared to the upstream conda-forge build script?
Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

ARROW-12246-conda-recipes

branch
June 2, 2022 09:44
@asfimportasfimport
mentioned this pull request
Apr 15, 2021

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-12246: [CI] Sync conda recipes with upstream feedstock - #9923
Closed
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Closed
ARROW-12246: [CI] Sync conda recipes with upstream feedstock#9923
jorisvandenbossche wants to merge 11 commits into
apache:masterfrom 
jorisvandenbossche:ARROW-12246-conda-recipes
Conversation
@jorisvandenbossche
@jorisvandenbosschejorisvandenbossche
commented
Apr 7, 2021•

edited

Loading

Copy link


Copy Markdown

Member
(I am first trying with linux)
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-12246
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 83b91bf34161bcfef9c5449c2d9161fe80477233
Submitted crossbow builds: ursacomputing/crossbow @ actions-275
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 7, 2021

Copy link


Copy Markdown

MemberAuthor
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 7, 2021

Copy link


Copy Markdown

Revision: 70a18ef102ef146c100865a30807f7d7875cb4ad
Submitted crossbow builds: ursacomputing/crossbow @ actions-276
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 985951ee3eff85a713d4518441715a5732803ae0
Submitted crossbow builds: ursacomputing/crossbow @ actions-284
TaskStatus
conda-linux-gcc-py38-cpuAzure
@jorisvandenbossche
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@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
jorisvandenbossche
commented
Apr 8, 2021

Copy link


Copy Markdown

MemberAuthor
ok if I take this over from you?
Sure!
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-linux-gcc-py38-cpu
@kszucs
kszucs
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
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
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 91b780510a57150d89588b8cb7f9285a9683ff16
Submitted crossbow builds: ursacomputing/crossbow @ actions-291
TaskStatus
conda-linux-gcc-py38-cpuAzure
@xhochy
xhochy
commented
Apr 8, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 8, 2021

Copy link


Copy Markdown

Revision: 82b5d5a1c685b90595e9ad013a7c7b341c527d2c
Submitted crossbow builds: ursacomputing/crossbow @ actions-298
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-aarch64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-aarch64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-aarch64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-aarch64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit conda-win-*
@github-actions
github-actionsBot
commented
Apr 9, 2021

Copy link


Copy Markdown

Revision: 989900a7c56a05826195d18462e8fa79511d8e31
Submitted crossbow builds: ursacomputing/crossbow @ actions-301
TaskStatus
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
@jorisvandenbossche@kszucs This is ready for review, updated all x86 conda packages and sneaked in builds for the Apple M1.
@xhochy
xhochy
commented
Apr 9, 2021

Copy link


Copy Markdown

Member
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
xhochyforce-pushed
the
ARROW-12246-conda-recipes
branch
from
989900a to
f337001CompareApril 12, 2021 13:01
@xhochy
xhochy
commented
Apr 12, 2021

Copy link


Copy Markdown

Member
@github-actions crossbow submit -g conda
@github-actions
github-actionsBot
commented
Apr 12, 2021

Copy link


Copy Markdown

Revision: f337001
Submitted crossbow builds: ursacomputing/crossbow @ actions-310
TaskStatus
conda-cleanAzure
conda-linux-gcc-py36-arm64Drone
conda-linux-gcc-py36-cpu-r36Azure
conda-linux-gcc-py36-cudaAzure
conda-linux-gcc-py37-arm64Drone
conda-linux-gcc-py37-cpu-r40Azure
conda-linux-gcc-py37-cudaAzure
conda-linux-gcc-py38-arm64Drone
conda-linux-gcc-py38-cpuAzure
conda-linux-gcc-py38-cudaAzure
conda-linux-gcc-py39-arm64Drone
conda-linux-gcc-py39-cpuAzure
conda-linux-gcc-py39-cudaAzure
conda-osx-arm64-clang-py38Azure
conda-osx-arm64-clang-py39Azure
conda-osx-clang-py36-r36Azure
conda-osx-clang-py37-r40Azure
conda-osx-clang-py38Azure
conda-osx-clang-py39Azure
conda-win-vs2017-py36-r36Azure
conda-win-vs2017-py37-r40Azure
conda-win-vs2017-py38Azure
conda-win-vs2017-py39Azure
jorisvandenbossche
jorisvandenbossche
commented
Apr 12, 2021
View reviewed changes
@jorisvandenbosschejorisvandenbossche
left a comment


Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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;)).
Comment threaddev/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
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment that those are commented out compared to the upstream conda-forge build script?
Comment threaddev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -1,6 +1,6 @@
{% set version = "3.0.0" %}
{% set version = ARROW_VERSION %}
@jorisvandenbosschejorisvandenbosscheApr 12, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

ARROW-12246-conda-recipes

branch
June 2, 2022 09:44
@asfimportasfimport
mentioned this pull request
Apr 15, 2021

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@jorisvandenbossche@xhochy@kszucs