Re: Proposal: renaming the 'master' branch to 'main'

[Fiona La]

Hi all,

@Neal, I have also already assigned myself to ARROW-15691, for updating archery 
to work with a default branch named ‘master’ or ‘main’, and will prioritize 
this task.

Thank you,
Fiona

From: Andrew Lamb 
Date: Tuesday, July 26, 2022 at 10:19 AM
To: dev 
Subject: Re: Proposal: renaming the 'master' branch to 'main'
I am in favor of making the switch in arrow-rs as well -- can someone file
an issue so to start that discussion?

On Tue, Jul 26, 2022 at 9:43 AM Kevin Gurney  wrote:

> Hi All,
>
> Thank you for bringing up this topic again.
>
> @Neal - I am already the assignee for ARROW-15693, which involves updating
> crossbow. I will work on completing this as soon as possible.
>
> Best Regards,
>
> Kevin Gurney
>
> 
> From: Remzi Yang <1371656737...@gmail.com>
> Sent: Monday, July 25, 2022 11:32 PM
> To: dev@arrow.apache.org 
> Subject: Re: Proposal: renaming the 'master' branch to 'main'
>
> Should we also do this change in arrow-rs?
>
> Remzi
>
> On Tue, 26 Jul 2022 at 11:25, Neal Richardson  >
> wrote:
>
> > Many of the subtasks on
> https://issues.apache.org/jira/browse/ARROW-15689<https://issues.apache.org/jira/browse/ARROW-15689><
> https://issues.apache.org/jira/browse/ARROW-15689<https://issues.apache.org/jira/browse/ARROW-15689>>
> > have already been done. What's left is to update archery and crossbow,
> then
> > we can ask Infra to make the switch. Is anyone able to take those
> subtasks
> > on?
> >
> > Neal
> >
> > On Mon, Jul 25, 2022 at 4:58 PM Matthew Topol
>  > >
> > wrote:
> >
> > > I'm in favor of it, for what it's worth.
> > >
> > > --Matt
> > >
> > > On Mon, Jul 25 2022 at 02:56:31 PM -0600, Wes McKinney
> > >  wrote:
> > > > hi all,
> > > >
> > > > Do you think we could make a push to make this happen after the 9.0.0
> > > > release goes out?
> > > >
> > > > Thanks
> > > > Wes
> > > >
> > > > On Tue, Feb 15, 2022 at 2:32 PM Fiona La  > > > <mailto:fion...@mathworks.com>> wrote:
> > > >>
> > > >> Thank you Antoine for bringing up the engineering work that is
> > > >> required to enable this. And thank you Neal for sharing the link to
> > > >> the previous discussion and creating the umbrella issue/breaking
> > > >> down the tasks in Jira.
> > > >>
> > > >> I am happy to work on these subtasks to move the effort forward;
> > > >> I’ll start with this subtask [1].
> > > >>
> > > >> [1]: 
> > > >> <https://issues.apache.org/jira/browse/ARROW-15692<https://issues.apache.org/jira/browse/ARROW-15692><
> https://issues.apache.org/jira/browse/ARROW-15692<https://issues.apache.org/jira/browse/ARROW-15692>>>
> > > >>
> > > >>
> > > >> From: Neal Richardson  > > >> <mailto:neal.p.richard...@gmail.com>>
> > > >> Date: Tuesday, February 15, 2022 at 3:38 PM
> > > >> To: dev mailto:dev@arrow.apache.org>>
> > > >> Subject: Re: Proposal: renaming the 'master' branch to 'main'
> > > >> Good point Antoine, there is engineering work to be done to allow
> > > >> this.
> > > >> I've made an umbrella issue [1] and broke out a bunch of subtasks.
> > > >> The idea
> > > >> is to update our code (mostly CI stuff) to use the default branch,
> > > >> whatever
> > > >> it happens to be called, and then after that is done we will be
> > > >> able to ask
> > > >> INFRA to make the change. Those who are interested in seeing this
> > > >> happen
> > > >> can work on those subtasks, and we can check back once those are
> > > >> done.
> > > >>
> > > >> Neal
> > > >>
> > > >> [1]:
> > > >> <https://issues.apache.org/jira/browse/ARROW-15689<https://issues.apache.org/jira/browse/ARROW-15689><
> https://issues.apache.org/jira/browse/ARROW-15689<https://issues.apache.org/jira/browse/ARROW-15689>>><<
> > > https://issues.apache.org/jira/browse/ARROW-15689<https://issues.apache.org/jira/browse/ARROW-15689><
> https://issues.apache.org/jira/browse/ARROW-15689<https://issues.apache.org/jira/browse

Re: Proposal: renaming the 'master' branch to 'main'

[Fiona La]

Thank you Antoine for bringing up the engineering work that is required to 
enable this. And thank you Neal for sharing the link to the previous discussion 
and creating the umbrella issue/breaking down the tasks in Jira.

I am happy to work on these subtasks to move the effort forward; I’ll start 
with this subtask [1].

[1]: https://issues.apache.org/jira/browse/ARROW-15692


From: Neal Richardson 
Date: Tuesday, February 15, 2022 at 3:38 PM
To: dev 
Subject: Re: Proposal: renaming the 'master' branch to 'main'
Good point Antoine, there is engineering work to be done to allow this.
I've made an umbrella issue [1] and broke out a bunch of subtasks. The idea
is to update our code (mostly CI stuff) to use the default branch, whatever
it happens to be called, and then after that is done we will be able to ask
INFRA to make the change. Those who are interested in seeing this happen
can work on those subtasks, and we can check back once those are done.

Neal

[1]: 
https://issues.apache.org/jira/browse/ARROW-15689<https://issues.apache.org/jira/browse/ARROW-15689>

On Mon, Feb 14, 2022 at 3:46 PM Antoine Pitrou  wrote:

>
> Le 14/02/2022 à 21:45, Neal Richardson a écrit :
> > There was discussion of this back in 2020 [1], and the consensus at the
> > time seemed to be to wait and see where git and GitHub would land before
> > making what could be a disruptive change. I support reopening the
> > discussion.
> >
> > It looks like quite a few ASF projects have switched to 'main' by now
> [2],
> > and in order to do so, we'd need a vote/consensus thread here and then
> make
> > an INFRA issue (like [3]).
>
> We also need someone to take responsibility for ensuring that all CI
> jobs and other automation is updated for the change. Presumably that
> could be the proponent.
>
> Regards
>
> Antoine.
>
>
> >
> > Neal
> >
> >
> > [1]: 
> > https://lists.apache.org/thread/hyc6nxn6k2c19g9h4wj4khoysvwomj41<https://lists.apache.org/thread/hyc6nxn6k2c19g9h4wj4khoysvwomj41>
> > [2]:
> >
> https://issues.apache.org/jira/issues/?jql=project%20%3D%20INFRA%20AND%20status%20%3D%20Closed%20AND%20text%20~%20%22main%20branch%22%20ORDER%20BY%20created%20DESC<https://issues.apache.org/jira/issues/?jql=project%20%3D%20INFRA%20AND%20status%20%3D%20Closed%20AND%20text%20~%20%22main%20branch%22%20ORDER%20BY%20created%20DESC>
> > [3]: 
> > https://issues.apache.org/jira/browse/INFRA-21723<https://issues.apache.org/jira/browse/INFRA-21723>
> >
> > On Mon, Feb 14, 2022 at 3:25 PM Mauricio Vargas  >
> > wrote:
> >
> >> +1
> >>
> >> On Mon, Feb 14, 2022 at 3:24 PM Fiona La  wrote:
> >>
> >>> Hello all,
> >>>
> >>> In order to be more inclusive and align with the Git<
> >>> https://sfconservancy.org/news/2020/jun/23/gitbranchname/<https://sfconservancy.org/news/2020/jun/23/gitbranchname>>
> >>>  and GitHub<
> >>>
> >>
> https://github.com/github/renaming#new-repositories-use-main-as-the-default-branch-name<https://github.com/github/renaming#new-repositories-use-main-as-the-default-branch-name>
> >>>
> >>> standards for the default branch of new repositories, I would like to
> >>> propose renaming the ‘master’ branch to ‘main’ in the Arrow project. I
> am
> >>> not sure if there has already been discussion about this, but I tried
> >>> searching the mailing list archives and did not see anyone mention this
> >> yet.
> >>>
> >>> In terms of tooling, GitHub has enabled renaming branches from the web
> >> UI<
> >>> https://github.com/github/renaming<https://github.com/github/renaming>>. 
> >>> I’m happy to help with this
> change
> >>> in any way that I can!
> >>>
> >>> Thank you,
> >>> Fiona
> >>>
> >>
> >>
> >> --
> >> —
> >> *Mauricio 'Pachá' Vargas Sepúlveda*
> >> Site: pacha.dev
> >> Blog: pacha.dev/blog<http://pacha.dev/blog>
> >>
> >
>

Proposal: renaming the 'master' branch to 'main'

[Fiona La]

Hello all,

In order to be more inclusive and align with the 
Git and 
GitHub
 standards for the default branch of new repositories, I would like to propose 
renaming the ‘master’ branch to ‘main’ in the Arrow project. I am not sure if 
there has already been discussion about this, but I tried searching the mailing 
list archives and did not see anyone mention this yet.

In terms of tooling, GitHub has enabled renaming branches from the web 
UI. I’m happy to help with this change in 
any way that I can!

Thank you,
Fiona

Re: Support for Co-authored-by tag on individual commits when integrating pull requests

[Fiona La]

Thanks Wes and Kevin!

I have opened a Jira ticket for tracking this work: 
https://issues.apache.org/jira/browse/ARROW-13564.

Regards,
Fiona

From: Kevin Gurney 
Date: Wednesday, August 4, 2021 at 4:00 PM
To: dev 
Cc: Fiona La 
Subject: Re: Support for Co-authored-by tag on individual commits when 
integrating pull requests
Hi Wes,

Thank you for the quick response!

No need to apologize! The Co-authored-by workflow is new to us, so we are 
learning what works as we go.

In terms of adding Fiona's name to the pull request that's already been 
integrated, we appreciate your consideration, but understand if this is too 
difficult to fix in the main branch at this point.

To prevent this issue from occurring in the future, we will open a pull request 
to modify the merge_arrow_pr.py script to scrape "Co-authored-by" tags as 
suggested.

Thank you!

Kevin


From: Wes McKinney 
Sent: Wednesday, August 4, 2021 11:02 AM
To: dev 
Cc: Fiona La 
Subject: Re: Support for Co-authored-by tag on individual commits when 
integrating pull requests

hi Kevin,

Unfortunately, I don't think it's possible to amend the existing
commit logs because that would require force-pushing the main branch.
I suppose we could revert the commit and push a new commit with the
commit message fixed.

> We realized after the pull request was integrated that Fiona may have gotten 
> credit if she pushed at least one commit from a separate GitHub account. 
> Although, we aren't 100% sure if this true.

Indeed, if Fiona's e-mail address was in the git Author field for any
commit in the PR, the PR merge script would have added a
"Co-authored-by:" message to the squashed commit message.

I think the next step here is to modify the PR merge script to scrape
any "Co-authored-by:" lines from the individual commit messages so
they can all be listed in the combined PR message.

Sorry about this, this is the first incidence of this particular issue
occurring to my knowledge.

Thanks
Wes

On Wed, Aug 4, 2021 at 9:46 AM Kevin Gurney  wrote:
>
> Hi All,
>
> Fiona La (Cc'd) and I recently worked together with Kou to integrate some 
> changes to the MATLAB interface (pull request: 
> https://github.com/apache/arrow/pull/10614<https://github.com/apache/arrow/pull/10614>).
>  Fiona and I pair programmed the implementation together on "one machine", 
> using my GitHub account to push commits. We used GitHub's support for 
> Co-authored-by tags 
> (https://docs.github.com/en/github/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors<https://docs.github.com/en/github/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors>)
>  to include Fiona's name on every commit. We thought this would be sufficient 
> to ensure that her name was included in the main Apache Arrow git history 
> after the commits were squashed and integrated by Kou. Unfortunately, it 
> looks like her name was dropped from the list of Co-authors during 
> integration.
>
> In order to ensure that all contributors to the project get credit:
>
> 1. Is there an existing, recommended best practice for pair programming on 
> pull requests that ensures all contributors get credit?
> * We realized after the pull request was integrated that Fiona may have 
> gotten credit if she pushed at least one commit from a separate GitHub 
> account. Although, we aren't 100% sure if this true.
> 2. It looks like 
> https://github.com/apache/arrow/blob/master/dev/merge_arrow_pr.py<https://github.com/apache/arrow/blob/master/dev/merge_arrow_pr.py>
>  does not support the Co-authored-by tag workflow on individual commits 
> described above.
> * We are interested in opening a pull request to modify merge_arrow_pr.py to 
> add support for this workflow.
> 3. Is there a way to retroactively add Fiona's name to the git history for 
> https://github.com/apache/arrow/pull/10614<https://github.com/apache/arrow/pull/10614>
>  so she receives credit?
>
> Thank you!
>
> Kevin Gurney

Re: [JIRA Permissions] Requesting change to "Contributor" role

[Fiona La]

Hello Kou,

Thank you! I am able to assign the issue to myself now.

Best regards,
Fiona

From: Sutou Kouhei 
Date: Tuesday, March 9, 2021 at 3:40 PM
To: dev@arrow.apache.org 
Subject: Re: [JIRA Permissions] Requesting change to "Contributor" role
Done. Could you try it again?

Thanks,
--
kou

In 

"[JIRA Permissions] Requesting change to "Contributor" role" on Tue, 9 Mar 2021 
20:29:46 +,
Fiona La  wrote:

> Hi all,
>
> I just submitted a Jira issue 
> (https://issues.apache.org/jira/browse/ARROW-11919<https://issues.apache.org/jira/browse/ARROW-11919>)
>  and I would like to request to be added as a Jira contributor to assign the 
> issue to myself.
>
> From the following Jira issue 
> (https://issues.apache.org/jira/browse/ARROW-11852<https://issues.apache.org/jira/browse/ARROW-11852>),
>  the steps for an Arrow JIRA admin are to go to Arrow Roles, click "Add users 
> to a role," and add me to the "Contributor" role. Most committers are 
> authorized to do this; if you're a committer and aren't able to load that 
> project admin page, have someone else add you to the necessary role.
>
> My Jira username is fionala.
>
> Thank you,
> Fiona

[JIRA Permissions] Requesting change to "Contributor" role

[Fiona La]

Hi all,

I just submitted a Jira issue 
(https://issues.apache.org/jira/browse/ARROW-11919) and I would like to request 
to be added as a Jira contributor to assign the issue to myself.

>From the following Jira issue 
>(https://issues.apache.org/jira/browse/ARROW-11852), the steps for an Arrow 
>JIRA admin are to go to Arrow Roles, click "Add users to a role," and add me 
>to the "Contributor" role. Most committers are authorized to do this; if 
>you're a committer and aren't able to load that project admin page, have 
>someone else add you to the necessary role.

My Jira username is fionala.

Thank you,
Fiona