Just a quick clarification! The "push --force" that I mentioned was *only* in the PR branch *before* merging! In this case, there was never a branch on the apache/avro repo that had its history changed by a `--force`.
I tend to be a bit more lenient on working branches on my own repos, especially to clean PRs that will be rebase+merged instead of squash+merged. It was a bit dubious, since I was working on a branch on kojirimike's repo, so I hope I didn't cause any extra confusion. Best regards, Ryan On Wed, Jan 29, 2020 at 5:22 PM Ryan Skraba <[email protected]> wrote: > Hello! > > I merged the python PR, which had the majority of the commits we wanted > for 1.9.2. My apologies if the "git push --force" was a bit of a pain to > follow -- I was trying to keep the git history readable. > > The next JIRA and PR I mentioned can be found here: > https://github.com/apache/avro/pull/794 > > Individually, all of those changes were reviewed, and I think I've seen > other cherry-picks to maintenance branches without a PR... is there a clear > guideline, or is it just at the discretion of the committer? In this case, > I wouldn't mind if someone glanced over the picks I put in the above PR! > > After that, I checked all the minor version bumps in 1.10.0-SNAPSHOT, that > could be picked, and created a JIRA and (final?) PR here: > https://github.com/apache/avro/pull/796 > > If someone could take a look at the above two PR, I'm ready to cut an RC > branch! > > All my best, Ryan > > > > > > > > On Mon, Jan 27, 2020 at 6:21 PM Ryan Skraba <[email protected]> wrote: > >> OK! Here's where we're at: >> >> I did some clean-up on the history of the python PR ( >> https://github.com/apache/avro/pull/777). Of course, there was a last >> minute hiccup with a rebase, so there's still one `fixup!` commit in the >> history for now. >> >> I created another JIRA and PR for additional cherry-picks ( >> https://github.com/apache/avro/pull/794), and will go through and update >> the JIRA that it references. >> >> Do you think it will be OK for me to cut the RC tag (Jan 28th)? I've got >> no objection to doing several RCs if necessary, and it would be great to >> get this one rolling! >> >> All my best, Ryan >> >> >> On Sun, Jan 26, 2020 at 8:59 PM Driesprong, Fokko <[email protected]> >> wrote: >> >>> Thanks for all the work Ryan. >>> >>> We just create an RC tag on the 1.9 branch, and build and publish the >>> artifact to the mailing list. Today I'll check if we want to cherry-pick >>> any minor dependency updates for Java. >>> >>> Cheers, Fokko >>> >>> Op wo 22 jan. 2020 om 18:28 schreef Ryan Skraba <[email protected]>: >>> >>> > Hello! Slow but certain -- I pushed the rest of the identified >>> commits for >>> > python, updated the tickets and am doing some confirmation! >>> > >>> > Notably, there was a nice cleanup/refactor of the Dockerfile that was >>> > cherry-picked. I kept some but not all of the tool bumps that it >>> included >>> > (as a separate commit). >>> > >>> > There's a couple of JIRA that are marked as fixed in 1.9.1, but don't >>> seem >>> > to actually be present (For info: AVRO-2377, AVRO-2298, AVRO-2426), >>> and I'm >>> > continuing down the list! >>> > >>> > Anybody have a good deadline to think about cutting a branch? Any last >>> > requests for fixes to be cherry-picked? >>> > >>> > I'll continue doing some basic clean-up as I can, but if the python >>> work is >>> > satisfactory https://github.com/apache/avro/pull/777, I'd be pretty >>> happy >>> > with the state of the branch. >>> > >>> > All my best, Ryan >>> > >>> > >>> > >>> > >>> > On Sat, Jan 18, 2020 at 1:07 AM Michael A. Smith <[email protected] >>> > >>> > wrote: >>> > >>> > > Ryan, thanks for agreeing to take a shot. I created a tracking ticket >>> > > for the effort: https://issues.apache.org/jira/browse/AVRO-2697 >>> > > >>> > > I attached a text file to that ticket with the PRs against master >>> that >>> > > I think we want in 1.9. The ones checked off are what I already >>> > > managed to do against my own fork's branch-1.9, in >>> > > https://github.com/apache/avro/pull/777 >>> > > >>> > > That PR is set to allow edits from maintainers, so you can update it >>> > > directly. If you find working that way cumbersome, feel free to just >>> > > open your own PR and I'll close mine. >>> > > >>> > > On Fri, Jan 17, 2020 at 9:52 AM Ryan Skraba <[email protected]> wrote: >>> > > > >>> > > > Hello! >>> > > > >>> > > > For python I'd be happy to go through the build changes, >>> especially if >>> > > > you can list (or create a branch) for the lang/py cherry-picks that >>> > > > are already known to be necessary! >>> > > > >>> > > > I've been going through the list of ALL the commits in master that >>> > > > have no equivalent in release-1.9 using: >>> > > > >>> > > > git co master && git cherry branch-1.9 >>> > > > >>> > > > I've identified a few minor issues, such as AVRO-2377, which is >>> marked >>> > > > as fixed 1.9.0 in JIRA but isn't in the release-1.9 branch. I'm >>> > > > making a list (and checking it twice), but it's very, very slow >>> > > > going... I'm hoping I pick up speed as I move along, any >>> tips+tricks >>> > > > would be appreciated! (I'm always on ASF slack, and I'm willing to >>> > > > put in the effort to document what I've learned in the wiki!) >>> > > > >>> > > > What do you think? One PR with all the cherry-picks I think are >>> > > > missing, or one PR per? >>> > > > >>> > > > In the meantime, I've got my key >>> > > > (http://people.apache.org/keys/committer/rskraba.asc) but I'll >>> need >>> > > > some PMC help to get all the permissions set up for a release. >>> > > > >>> > > > 1. My key should be added at svn co --depth=files >>> > > > https://dist.apache.org/repos/dist/release/avro/ >>> > > > 2.3.4. I have accounts at https://www.npmjs.com/~ryanskraba, >>> > > > https://pypi.org/user/RyanSkraba/, and >>> > > > https://rubygems.org/profiles/RyanSkraba and need permissions to >>> > > > (eventually) publish artifacts. >>> > > > 5. Can I get edit permissions on the Avro confluence wiki? >>> > > > >>> > > > Is 2,3,4 necessary or does someone already with permissions do the >>> > > release? >>> > > > >>> > > > All my best! Ryan >>> > > > >>> > > > >>> > > > On Fri, Jan 17, 2020 at 1:47 AM Michael A. Smith < >>> [email protected] >>> > > >>> > > wrote: >>> > > > > >>> > > > > I may have bitten off more than I can chew here. I've been >>> unable to >>> > > cherry >>> > > > > pick all the changes from master into 1.9. The python changes >>> > > themselves >>> > > > > are not the problem-- I think the problem is that there have been >>> > > several >>> > > > > changes to Dockerfile and the build system, some related to >>> python >>> > and >>> > > some >>> > > > > not. Those changes are wide-ranging and not easy to cherry pick. >>> They >>> > > don't >>> > > > > affect functionality directly, but if I skip them I don't think >>> the >>> > > tests >>> > > > > can pass. >>> > > > > >>> > > > > Does anyone with a better understanding of the 1.9 chronology >>> want to >>> > > give >>> > > > > it a shot? >>> > > > > >>> > > > > On Mon, Jan 13, 2020 at 06:57 Michael A. Smith < >>> [email protected] >>> > > >>> > > wrote: >>> > > > > >>> > > > > > The only direct API changes were to deprecate capital-P parse >>> in >>> > > lang/py3. >>> > > > > > The syntax is still supported, but will cause a warning. >>> > > > > > >>> > > > > > There are some implied API changes insofar as we dropped >>> support >>> > for >>> > > > > > python<2.7 as well, removing some polyfills and syntax that >>> > > supported old >>> > > > > > pythons as well. >>> > > > > > >>> > > > > > Unless I missed something I think we're still sufficiently API >>> > > compatible. >>> > > > > > >>> > > > > > Cheers, Michael >>> > > > > > >>> > > > > > On Mon, Jan 13, 2020 at 05:01 Driesprong, Fokko >>> > <[email protected] >>> > > > >>> > > > > > wrote: >>> > > > > > >>> > > > > >> Hi Mike, >>> > > > > >> >>> > > > > >> Do you know if this introduces any breaking changes to the >>> API? >>> > > Since this >>> > > > > >> is a minor update, we should keep the API compatible. >>> > > > > >> >>> > > > > >> Cheers, Fokko >>> > > > > >> >>> > > > > >> Op za 11 jan. 2020 om 13:51 schreef Michael A. Smith < >>> > > > > >> [email protected]>: >>> > > > > >> >>> > > > > >> > So far none of my python2/3 changes have been targeting 1.9. >>> > > They're >>> > > > > >> > currently just in master. It would be great if someone could >>> > > cherry pick >>> > > > > >> > them. I'm away this weekend, but happy to help via phone or >>> more >>> > > > > >> directly >>> > > > > >> > next week if it turns complex. >>> > > > > >> > >>> > > > > >> > Best regards, >>> > > > > >> > Mike >>> > > > > >> > >>> > > > > >> > On Sat, Jan 11, 2020 at 07:39 Driesprong, Fokko >>> > > <[email protected]> >>> > > > > >> > wrote: >>> > > > > >> > >>> > > > > >> > > Thanks for the review Ryan, appreciate it. >>> > > > > >> > > >>> > > > > >> > > I'm happy to help you with the release, if you could pick >>> that >>> > > up, >>> > > > > >> that >>> > > > > >> > > would be great. Before starting the release process, I'd >>> like >>> > to >>> > > > > >> check if >>> > > > > >> > > there are commits that are targeted for 1.10 but can be >>> > > cherry-picked >>> > > > > >> > back >>> > > > > >> > > to 1.9.2. >>> > > > > >> > > >>> > > > > >> > > For doing the release, there are two important things: >>> > > > > >> > > - Having the gpg keys in place: >>> > > > > >> > > https://www.apache.org/dev/release-signing.html >>> > > > > >> > > - Run the build chain for building the artifacts for the >>> > > different >>> > > > > >> > > platforms: >>> > > > > >> > >>> https://cwiki.apache.org/confluence/display/AVRO/How+To+Release >>> > > > > >> > > >>> > > > > >> > > Luckily we have Docker for the latter :-) >>> > > > > >> > > >>> > > > > >> > > Cheers, Fokko >>> > > > > >> > > >>> > > > > >> > > Op vr 10 jan. 2020 om 17:41 schreef Ryan Skraba < >>> > > [email protected]>: >>> > > > > >> > > >>> > > > > >> > > > Hello! I read and reviewed the PR -- it looks OK to >>> me, is >>> > > there >>> > > > > >> > > > something more to do to the current fix? >>> > > > > >> > > > >>> > > > > >> > > > I'd be happy to do or help out with the release ... I >>> > suspect >>> > > I >>> > > > > >> might >>> > > > > >> > > > need a bit of hand-holding for this first time, but the >>> doc >>> > > looks >>> > > > > >> > > > pretty complete. Alternatively, if it's easier, I could >>> > > shadow >>> > > > > >> > > > whoever is doing this one and be ready for the next. >>> It's >>> > > pretty >>> > > > > >> > > > exciting to see the cadence pick up for Avro! >>> > > > > >> > > > >>> > > > > >> > > > All my best, Ryan >>> > > > > >> > > > >>> > > > > >> > > > On Thu, Jan 9, 2020 at 9:48 AM Driesprong, Fokko >>> > > > > >> <[email protected] >>> > > > > >> > > >>> > > > > >> > > > wrote: >>> > > > > >> > > > > >>> > > > > >> > > > > Hi all, >>> > > > > >> > > > > >>> > > > > >> > > > > I'm working on bumping Apache Avro on the Apache >>> Iceberg >>> > > project: >>> > > > > >> > > > > https://github.com/apache/incubator-iceberg/pull/297, >>> > I've >>> > > > > >> > discovered >>> > > > > >> > > a >>> > > > > >> > > > > regression bug. I've managed to create a unit test >>> that >>> > > catches >>> > > > > >> the >>> > > > > >> > > > issue: >>> > > > > >> > > > > https://github.com/apache/avro/pull/752. The current >>> fix >>> > > isn't >>> > > > > >> the >>> > > > > >> > > > correct >>> > > > > >> > > > > one. I hope to fix it somewhere this weekend, and >>> > > afterward, start >>> > > > > >> > the >>> > > > > >> > > > > release process for 1.9.2. >>> > > > > >> > > > > >>> > > > > >> > > > > If there is anything that you need to have >>> cherry-picked >>> > > onto the >>> > > > > >> 1.9 >>> > > > > >> > > > > branch, please let me know. Also, if there is anyone >>> who >>> > > likes to >>> > > > > >> > > > shepherd >>> > > > > >> > > > > the release, or wants to help out, please feel free >>> to let >>> > > me know >>> > > > > >> > :-) >>> > > > > >> > > > > >>> > > > > >> > > > > Thanks all, >>> > > > > >> > > > > >>> > > > > >> > > > > Cheers, Fokko >>> > > > > >> > > > >>> > > > > >> > > >>> > > > > >> > >>> > > > > >> >>> > > > > > >>> > > >>> > >>> >>
