How did you do the cherry-picking? I'm very surprised that you needed to pick up the Flight additions.
Regards Antoine. Le 21/10/2019 à 18:18, Krisztián Szűcs a écrit : > On Mon, Oct 21, 2019 at 5:28 PM Wes McKinney <wesmck...@gmail.com> wrote: > >> Thanks Krisztian >> >> I'm going to finish ARROW-6910 soon so it can be merged. I don't have >> a patch yet for ARROW-6895 but hope to complete it today, but it is >> not a blocker. If you are able to prepare the maintenance branch, it >> probably makes sense to check that the binary package builds are >> looking okay in the meantime >> > I had to include https://issues.apache.org/jira/browse/ARROW-6855 > and https://issues.apache.org/jira/browse/ARROW-6610 to keep the > cherry-picking clearer. They should not cause cause any API breakages. > > I've created a PR to the maintenance branch to run both the CI test > and the packaging builds: https://github.com/apache/arrow/pull/5708 > >> >> On Mon, Oct 21, 2019 at 10:21 AM Krisztián Szűcs >> <szucs.kriszt...@gmail.com> wrote: >>> >>> Hi, >>> >>> I've created a small snippet to query the tickets under a specific >>> JIRA version and cherry-pick them in the same order as they were >>> applied to the master branch [1]. >>> A couple new files were added between certain commits, so the >>> patches don't merge cleanly. I'm going to try resolving the conflict >>> manually (and/or include dependent commits if required). >>> >>> [1]: https://gist.github.com/kszucs/b2743546044ccd3215e5bb34fa0d76a0 >>> >>> On Fri, Oct 18, 2019 at 9:29 PM Wes McKinney <wesmck...@gmail.com> >> wrote: >>> >>>> hi Krisz, >>>> >>>> Thanks for the update. >>>> >>>> I'm going to look at the Windows wheels in my VM to see if I can >>>> determine what's wrong and fix it. >>>> >>>> I think because of the wheel issue we may have to include the >>>> compression library option changes in 0.15.1 because otherwise there >>>> may be some dependency between that change and the other changes >>>> related to shared library linking. >>>> >>>> I'm going to try to put together a script to generate the cherry-pick >>>> script here this afternoon with luck. It seems like cutting an RC >>>> today is not going to be feasible so hopefully we can do it on Monday >>>> or Tuesday. Hopefully the changes will cherry pick cleanly >>>> >>>> - Wes >>>> >>>> On Fri, Oct 18, 2019 at 2:10 PM Krisztián Szűcs >>>> <szucs.kriszt...@gmail.com> wrote: >>>>> >>>>> So seems like there are still 5 unresolved issues in the release: >>>>> https://issues.apache.org/jira/projects/ARROW/versions/12346358 >>>>> >>>>> I won't be available during the weekend, but I can cut the release >>>>> on Monday. >>>>> >>>>> The packaging builds should be fixed except the windows wheels, >>>>> although this problem might not affect the release branch depending >>>>> on the patches we'll include. >>>>> >>>>> Do we have some script for querying the jira issues and cherry >> picking >>>>> the patches in order or that was purely manual process so far? >>>>> >>>>> On Thu, Oct 17, 2019 at 9:53 AM Wes McKinney <wesmck...@gmail.com> >>>> wrote: >>>>> >>>>>> Thanks. Yes, you have to type >>>>>> >>>>>> 1.0.0,0.15.1 >>>>>> >>>>>> when merging to set both fix versions >>>>>> >>>>>> On Thu, Oct 17, 2019 at 8:52 AM Antoine Pitrou <anto...@python.org >>> >>>> wrote: >>>>>>> >>>>>>> >>>>>>> I added 0.15.1 back to a couple of fixed issues where the merge >>>> script >>>>>>> removed it :-/ >>>>>>> >>>>>>> >>>>>>> >>>>>>> Le 17/10/2019 à 09:30, Wes McKinney a écrit : >>>>>>>> Nearly all the fixes are in for 0.15.1. >>>>>>>> >>>>>>>> I think the only thing preventing us from making an RC soon is >>>>>>>> (surprise) new problems with packaging (Homebrew-related, and >>>> others). >>>>>>>> >>>>>>>> Anything else that needs to go into 0.15.1 that is not marked >> as >>>> such? >>>>>>>> >>>>>>>> On Sat, Oct 12, 2019 at 1:52 AM Fan Liya <liya.fa...@gmail.com >>> >>>> wrote: >>>>>>>>> >>>>>>>>> I have update ARROW-6738 < >>>>>> https://issues.apache.org/jira/browse/ARROW-6738> >>>>>>>>> to add 0.15.1. >>>>>>>>> I hope this bug can be fixed in the next release. >>>>>>>>> >>>>>>>>> Best, >>>>>>>>> Liya Fan >>>>>>>>> >>>>>>>>> On Sat, Oct 12, 2019 at 12:38 PM Micah Kornfield < >>>>>> emkornfi...@gmail.com> >>>>>>>>> wrote: >>>>>>>>> >>>>>>>>>> I updated the JIRA to add 0.15.1 but ARROW-6806 seems like it >>>> should >>>>>> be >>>>>>>>>> included as well. >>>>>>>>>> >>>>>>>>>> On Fri, Oct 11, 2019 at 2:40 PM Wes McKinney < >>>> wesmck...@gmail.com> >>>>>> wrote: >>>>>>>>>> >>>>>>>>>>> I just created a 0.15.1 version in JIRA. Please mark the >> issues >>>> you >>>>>>>>>>> want to include in the release. Perhaps we can cut an RC by >> mid >>>> next >>>>>>>>>>> week if bug fixes to the critical issues have been sorted >> out. >>>>>>>>>>> >>>>>>>>>>> On Fri, Oct 11, 2019 at 3:53 PM Neal Richardson >>>>>>>>>>> <neal.p.richard...@gmail.com> wrote: >>>>>>>>>>>> >>>>>>>>>>>> If 6844 isn't Python-only (I can't tell from the >> description) >>>> and >>>>>>>>>>>> we're updating C++ libraries, I'd like to include >>>>>>>>>>>> https://issues.apache.org/jira/browse/ARROW-3808 for R >> (not a >>>> bug >>>>>> fix >>>>>>>>>>>> but would be helpful to get out). But if there's no C++ >> change >>>>>>>>>>>> involved, then I probably wouldn't bother to update R on >> CRAN, >>>> so >>>>>> it's >>>>>>>>>>>> moot. >>>>>>>>>>>> >>>>>>>>>>>> Neal >>>>>>>>>>>> >>>>>>>>>>>> On Fri, Oct 11, 2019 at 1:33 PM Sutou Kouhei < >>>> k...@clear-code.com> >>>>>>>>>> wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> Hi, >>>>>>>>>>>>> >>>>>>>>>>>>> If we release 0.15.1, I want to include >>>>>>>>>>>>> https://issues.apache.org/jira/browse/ARROW-6777 into it. >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Thanks, >>>>>>>>>>>>> -- >>>>>>>>>>>>> kou >>>>>>>>>>>>> >>>>>>>>>>>>> In <CAJPUwMAqRsg9E= >>>>>>>>>> gvr8cfnau09qs47dgauszfnvyquhasv8y...@mail.gmail.com >>>>>>>>>>>> >>>>>>>>>>>>> "Possible Arrow 0.15.1 release" on Fri, 11 Oct 2019 >>>> 09:44:21 >>>>>> -0500, >>>>>>>>>>>>> Wes McKinney <wesmck...@gmail.com> wrote: >>>>>>>>>>>>> >>>>>>>>>>>>>> hi folks, >>>>>>>>>>>>>> >>>>>>>>>>>>>> On account of a >>>> https://issues.apache.org/jira/browse/ARROW-6844 >>>>>>>>>> we >>>>>>>>>>>>>> might want to make a 0.15.1 release before the next major >>>>>> release. >>>>>>>>>> I >>>>>>>>>>>>>> can look into a bug fix, but if we decide to go this >> route we >>>>>>>>>> should >>>>>>>>>>>>>> begin tracking other bug fixes that we'd like to include >> in a >>>>>> patch >>>>>>>>>>>>>> release. Thoughts? >>>>>>>>>>>>>> >>>>>>>>>>>>>> - Wes >>>>>>>>>>> >>>>>>>>>> >>>>>> >>>> >> >
