<div dir="ltr">web page updated btw</div><br><div class="gmail_quote"><div dir="ltr">ne 14. 2. 2016 v 21:35 odesílatel Jachym Cepicky <<a href="mailto:jachym.cepicky@gmail.com">jachym.cepicky@gmail.com</a>> napsal:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">this is HUGE<div><br></div><div>thanks!</div></div><br><div class="gmail_quote"><div dir="ltr">ne 14. 2. 2016 v 19:09 odesílatel Tom Kralidis <<a href="mailto:tomkralidis@gmail.com" target="_blank">tomkralidis@gmail.com</a>> napsal:<br></div></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Done. Notes:<br>
<br>
- master is now updated. Development for PyWPS 4 is in geopython/pywps master<br>
- 3.2 branch support happens in pywps-3.2<br>
- just in case, I made a copy of master before the merge (branch<br>
called master-old-2014-02-14<br>
- devs should update their repos/forks accordingly before moving any further<br>
<br>
..Tom<br>
<br>
<br>
<br>
On Sun, Feb 14, 2016 at 3:01 AM, Jachym Cepicky<br>
<<a href="mailto:jachym.cepicky@gmail.com" target="_blank">jachym.cepicky@gmail.com</a>> wrote:<br>
> HI Tom,<br>
><br>
> thanks for summarising the topic<br>
><br>
> I was always saying: we should put stable release to master.<br>
><br>
> But I think, .. pywps-4 is now in "good enough" shape, so it can be put to<br>
> master branch.<br>
><br>
> Anybody who uses "master" should be on the mailing list, so no big surprise<br>
> should occur, when the big bang happens.<br>
><br>
> so from my perspective: any time now :)<br>
><br>
> J<br>
><br>
> čt 11. 2. 2016 v 21:29 odesílatel Tom Kralidis <<a href="mailto:tomkralidis@gmail.com" target="_blank">tomkralidis@gmail.com</a>><br>
> napsal:<br>
>><br>
>><br>
>> Thanks Luís. FYI I've tested this approach against my fork for an idea:<br>
>><br>
>> <a href="https://github.com/tomkralidis/pywps" rel="noreferrer" target="_blank">https://github.com/tomkralidis/pywps</a><br>
>><br>
>> Here is the commit history:<br>
>><br>
>> <a href="https://github.com/tomkralidis/pywps/commits/master" rel="noreferrer" target="_blank">https://github.com/tomkralidis/pywps/commits/master</a><br>
>><br>
>> Note that last push is the action that updates master.<br>
>><br>
>> As well, I would push a backup copy of master called master-old before<br>
>> merging just in case.<br>
>><br>
>> Thoughts on moving forward? To recap, propose pywps-4 branch to become<br>
>> the new master branch and branch pywps-3.2 is our 3.x support.<br>
>><br>
>> ..Tom<br>
>><br>
>> On Thu, 11 Feb 2016, Luís de Sousa wrote:<br>
>><br>
>> > Date: Thu, 11 Feb 2016 19:51:49 +0100<br>
>> > From: Luís de Sousa <<a href="mailto:luis.a.de.sousa@gmail.com" target="_blank">luis.a.de.sousa@gmail.com</a>><br>
>> > To: Tom Kralidis <<a href="mailto:tomkralidis@gmail.com" target="_blank">tomkralidis@gmail.com</a>><br>
>> > Cc: "<a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a>" <<a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a>><br>
>> > Subject: Re: [Pywps-dev] development workflow update<br>
>> ><br>
>> > Hi Tom,<br>
>> ><br>
>> > I understand your points; the ours strategy looks appropriate.<br>
>> ><br>
>> > Luís<br>
>> ><br>
>> > On 11 February 2016 at 13:30, Tom Kralidis <<a href="mailto:tomkralidis@gmail.com" target="_blank">tomkralidis@gmail.com</a>><br>
>> > wrote:<br>
>> >><br>
>> >> Hi Luís: good question. IMHO keeping both under the same repostory<br>
>> >> makes sense from a project viability perspective:<br>
>> >><br>
>> >> - we are in OSGeo incubation for 3. Doing a merge now keeps the<br>
>> >> project straight / clean over time<br>
>> >> - since the incubation started in 3, it is not clear if the<br>
>> >> application will be valid after rewriting the software, dump the old<br>
>> >> code base and starting from scratch. Having said this, 4 will have<br>
>> >> to<br>
>> >> to be mature, which takes time, with lots of deployments and<br>
>> >> community<br>
>> >> behind it<br>
>> >> - there is already a considerable community around 3 so let's leverage<br>
>> >> that existing community<br>
>> >> - the licensing change and rewrite between PyWPS 3 and 4 does not<br>
>> >> present<br>
>> >> any complications<br>
>> >> - packaging management becomes much easier along a single path<br>
>> >><br>
>> >> ..Tom<br>
>> >><br>
>> >><br>
>> >> On Thu, 11 Feb 2016, Luís de Sousa wrote:<br>
>> >><br>
>> >>> Date: Thu, 11 Feb 2016 08:44:25 +0100<br>
>> >>> From: Luís de Sousa <<a href="mailto:luis.a.de.sousa@gmail.com" target="_blank">luis.a.de.sousa@gmail.com</a>><br>
>> >>> To: Tom Kralidis <<a href="mailto:tomkralidis@gmail.com" target="_blank">tomkralidis@gmail.com</a>><br>
>> >>> Cc: "<a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a>" <<a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a>><br>
>> >>> Subject: Re: [Pywps-dev] development workflow update<br>
>> >>><br>
>> >>><br>
>> >>> Hi there Tom,<br>
>> >>><br>
>> >>> What are the advantages of merging the two git projects? It seems far<br>
>> >>> simpler to keep versions 3 and 4 separated.<br>
>> >>><br>
>> >>> Luís<br>
>> >>><br>
>> >>> On 11 February 2016 at 02:37, Tom Kralidis <<a href="mailto:tomkralidis@gmail.com" target="_blank">tomkralidis@gmail.com</a>><br>
>> >>> wrote:<br>
>> >>>><br>
>> >>>> More thoughts:<br>
>> >>>><br>
>> >>>> Given current master and pywps-4 branches have totally different<br>
>> >>>> commit histories, it is not possible to simply merge pywps-4 into<br>
>> >>>> master via GitHub pull request. One option we could consider is<br>
>> >>>> using<br>
>> >>>> the "ours" merge strategy:<br>
>> >>>><br>
>> >>>> git checkout pywps-4<br>
>> >>>> git merge -s ours master<br>
>> >>>> git checkout master<br>
>> >>>> git merge pywps-4<br>
>> >>>> git push -f origin master<br>
>> >>>><br>
>> >>>> This essentially pushes pywps-4 into master branch without wiping out<br>
>> >>>> master branch history.<br>
>> >>>><br>
>> >>>> ..Tom<br>
>> >>>><br>
>> >>>><br>
>> >>>> On Tue, Feb 9, 2016 at 4:28 PM, Tom Kralidis <<a href="mailto:tomkralidis@gmail.com" target="_blank">tomkralidis@gmail.com</a>><br>
>> >>>> wrote:<br>
>> >>>>><br>
>> >>>>><br>
>> >>>>> Hi all: FYI the following have been completed<br>
>> >>>>> against <a href="https://github.com/geopython/pywps" rel="noreferrer" target="_blank">https://github.com/geopython/pywps</a>:<br>
>> >>>>><br>
>> >>>>> - master branch is up to date<br>
>> >>>>> - issues / milestones are up to date and represent 3.x and 4.x plans<br>
>> >>>>> - branch pywps-4 represents our PyWPS 4 effort<br>
>> >>>>> - branch pywps-3.2 represents our 3.x development. At this point in<br>
>> >>>>> time<br>
>> >>>>> any<br>
>> >>>>> fixes in master that apply to 3.x should be also applied to branch<br>
>> >>>>> pywps-3.2<br>
>> >>>>> - any further 3.x releases are to built/tagged/released off branch<br>
>> >>>>> pywps-3.2<br>
>> >>>>><br>
>> >>>>> At some point branch pywps-4 will be merged as master and pywps-3.2<br>
>> >>>>> will<br>
>> >>>>> be<br>
>> >>>>> our 3.x support branch. From that point forward, any changes in<br>
>> >>>>> master<br>
>> >>>>> should _not_ be applied to branch pywps-3.2 given the backward<br>
>> >>>>> compability break.<br>
>> >>>>><br>
>> >>>>> I'd like to hear thoughts on pywps-4 -> master efforts and when<br>
>> >>>>> folks<br>
>> >>>>> think is a good time to move that over. The idea here is that we<br>
>> >>>>> have<br>
>> >>>>> supported releases (3.2.3) to download or pip install, and master<br>
>> >>>>> represents development. Does anyone have any knowledge that master<br>
>> >>>>> is being used operationally anywhere (which is a bad idea given it's<br>
>> >>>>> not a release).<br>
>> >>>>><br>
>> >>>>> Cheers<br>
>> >>>>><br>
>> >>>>> ..Tom<br>
>> >>>><br>
>> >>>> _______________________________________________<br>
>> >>>> pywps-dev mailing list<br>
>> >>>> <a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a><br>
>> >>>> <a href="http://lists.osgeo.org/mailman/listinfo/pywps-dev" rel="noreferrer" target="_blank">http://lists.osgeo.org/mailman/listinfo/pywps-dev</a><br>
>> >>><br>
>> >>><br>
>> >><br>
>> ><br>
>> _______________________________________________<br>
>> pywps-dev mailing list<br>
>> <a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a><br>
>> <a href="http://lists.osgeo.org/mailman/listinfo/pywps-dev" rel="noreferrer" target="_blank">http://lists.osgeo.org/mailman/listinfo/pywps-dev</a><br>
</blockquote></div></blockquote></div>