Ok guys, I finished the merge of our 3 main repos:
*https://github.com/marvin-ai/marvin-python-toolbox <https://github.com/marvin-ai/marvin-python-toolbox>* *https://github.com/marvin-ai/marvin-public-engines <https://github.com/marvin-ai/marvin-public-engines>* *https://github.com/marvin-ai/marvin-engine-executor <https://github.com/marvin-ai/marvin-engine-executor>* Into this one ... *https://github.com/marvin-ai/incubator-apache-marvin <https://github.com/marvin-ai/incubator-apache-marvin>* All commits history remained and ... please check and feel free to collaborate before we replicate into our apache account. And any problem ...let me know! Thanks, Taka Em ter, 2 de out de 2018 às 11:48, Daniel Takabayashi < daniel.takabaya...@gmail.com> escreveu: > Sounds good. > > Em ter, 2 de out de 2018 às 11:44, Luciano Resende <luckbr1...@gmail.com> > escreveu: > >> So, before pushing to the apache repo, make a draft repo outside apache >> and let couple people to review.... >> >> The you can push to apache... as a mirror. >> >> On Tue, Oct 2, 2018 at 12:07 Daniel Takabayashi < >> daniel.takabaya...@gmail.com> wrote: >> >>> Ok, now is clear.... >>> >>> This is the repo >>> <https://github.com/marvin-ai/incubator-apache-marvin.git> I am going >>> to push the new merged code. Another question is about the license, right >>> now all files has this license here: >>> >>> # Copyright [2017] [B2W Digital] >>> # >>> # Licensed under the Apache License, Version 2.0 (the "License"); >>> # you may not use this file except in compliance with the License. >>> # You may obtain a copy of the License at >>> # >>> # http://www.apache.org/licenses/LICENSE-2.0 >>> # >>> # Unless required by applicable law or agreed to in writing, software >>> # distributed under the License is distributed on an "AS IS" BASIS, >>> # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or >>> implied. >>> # See the License for the specific language governing permissions and >>> # limitations under the License. >>> >>> should we change this before the import commit or later is ok? >>> >>> Thanks, >>> Taka >>> >>> >>> Em seg, 1 de out de 2018 às 19:24, Luciano Resende <luckbr1...@gmail.com> >>> escreveu: >>> >>>> This is a little bit different because it's the first code import. >>>> >>>> As a suggestion, how about you create a repository somewhere in GitHub >>>> when you are ready to import, let the community do a quick review, and >>>> we can then import it as a replica. >>>> On Mon, Oct 1, 2018 at 7:06 PM Daniel Takabayashi >>>> <daniel.takabaya...@gmail.com> wrote: >>>> > >>>> > Hey guys, I will try to finish this by today. But then I need to open >>>> any PR or what?? >>>> > >>>> > As is my first time as Apache contributor I’m a little lost about the >>>> correct procedure. Could you clarify this Luciano? >>>> > >>>> > Sent from my iPhone >>>> > >>>> > > On Oct 1, 2018, at 6:50 PM, Lucas Bonatto Miguel < >>>> lucasbona...@gmail.com> wrote: >>>> > > >>>> > > Hey Luciano, Daniel and I started working on it this weekend, it is >>>> being a >>>> > > bit more tricky then we thought. We should have the code pushed by >>>> the end >>>> > > of this week. >>>> > > >>>> > > - Lucas >>>> > > >>>> > >> On Thu, 27 Sep 2018 at 2:04 PM Luciano Resende < >>>> luckbr1...@gmail.com> wrote: >>>> > >> >>>> > >> Any progress here? Any help needed? >>>> > >> >>>> > >> Note that the software grant process is not a blocker on having the >>>> > >> code imported and these can occur in parallel. >>>> > >> On Thu, Sep 20, 2018 at 9:47 PM Daniel Takabayashi >>>> > >> <daniel.takabaya...@gmail.com> wrote: >>>> > >>> >>>> > >>> Yes...the ideia is to merge all repos but keeping the history of >>>> all >>>> > >>> commits. >>>> > >>> I did this once in the past and is pretty easy and reliable. >>>> > >>> >>>> > >>> About the grant any information or request to B2W, I can arrange. >>>> Just >>>> > >> let >>>> > >>> me know @Lucas Bonatto Miguel <lucasbona...@gmail.com> . >>>> > >>> >>>> > >>> Em qui, 20 de set de 2018 às 18:43, Lucas Bonatto Miguel < >>>> > >>> lucasbona...@gmail.com> escreveu: >>>> > >>> >>>> > >>>> I can help with the grant process, should we request the current >>>> > >> copyright >>>> > >>>> owner to sign this ( >>>> > >>>> http://www.apache.org/licenses/proposed/software-grant.txt) >>>> document? >>>> > >> Any >>>> > >>>> other special instructions? >>>> > >>>> >>>> > >>>> Regarding the repos, I'm pretty sure we can add the original >>>> repos as >>>> > >> new >>>> > >>>> remotes, rebase them into the new Apache repo and move the files >>>> to the >>>> > >>>> appropriated folders, this would keep the history of all repos. >>>> > >>>> >>>> > >>>> Regards, >>>> > >>>> Lucas >>>> > >>>> >>>> > >>>> On Thu, Sep 20, 2018 at 6:19 PM Luciano Resende < >>>> luckbr1...@gmail.com> >>>> > >>>> wrote: >>>> > >>>> >>>> > >>>>> So, what's the goal here? >>>> > >>>>> >>>> > >>>>> A pure merge will get a repository without history. Is this the >>>> > >>>> intention? >>>> > >>>>> >>>> > >>>>> Otherwise, we can import one repository (maybe with the most >>>> code, or >>>> > >>>>> most history) and then start merging the other two (which you >>>> will >>>> > >>>>> then lose the history). In this scenario, at least some history >>>> is >>>> > >>>>> preserved. >>>> > >>>>> >>>> > >>>>> Also, we need to start working on the software grant process to >>>> > >>>>> officially donate the code to Apache. >>>> > >>>>> >>>> > >>>>> Thanks >>>> > >>>>> >>>> > >>>>> ---------- Forwarded message --------- >>>> > >>>>> From: Daniel Takabayashi <daniel.takabaya...@gmail.com> >>>> > >>>>> Date: Thu, Sep 20, 2018 at 2:59 PM >>>> > >>>>> Subject: Re: Welcome to Marvin podling >>>> > >>>>> To: <dev@marvin.apache.org> >>>> > >>>>> >>>> > >>>>> >>>> > >>>>> Great Luciano! Thanks... >>>> > >>>>> >>>> > >>>>> So...now I going to start the merge of the 3 main repos: >>>> > >>>>> >>>> > >>>>> marvin-python-toolbox >>>> > >>>>> marvin-engine-executor >>>> > >>>>> marvin-public-engines >>>> > >>>>> >>>> > >>>>> I think this will be easy...This will generate our first PR, >>>> right? >>>> > >>>>> >>>> > >>>>> >>>> > >>>>> >>>> > >>>>> -- >>>> > >>>>> Luciano Resende >>>> > >>>>> http://twitter.com/lresende1975 >>>> > >>>>> http://lresende.blogspot.com/ >>>> > >>>>> >>>> > >>>> >>>> > >> >>>> > >> >>>> > >> >>>> > >> -- >>>> > >> Luciano Resende >>>> > >> http://twitter.com/lresende1975 >>>> > >> http://lresende.blogspot.com/ >>>> > >> >>>> >>>> >>>> >>>> -- >>>> Luciano Resende >>>> http://twitter.com/lresende1975 >>>> http://lresende.blogspot.com/ >>>> >>> -- >> Sent from my Mobile device >> >
