<div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small">Hi</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Feb 8, 2016 at 8:25 AM, Andreas Neumann <span dir="ltr"><<a href="mailto:a.neumann@carto.net" target="_blank">a.neumann@carto.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000">
Hi Tim,<br>
<br>
Thank you for the draft!<br>
<br>
One issue I have is the term "master branch" - which perhaps could
be made clearer, less ambiguous.<br></div></blockquote><div><br></div><div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small">Master branch = the branch called 'master' in GIT - I will add that as a clarification.</div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div bgcolor="#FFFFFF" text="#000000">
<br>
Is there only one "master branch" at any time or will there be two
parallel "master branches"<div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small;display:inline"> </div>- a 2.x one and a 3.x one? Normally, I
would assume that there can be only one master branch at any given
time - e.g. 2x will stay master branch until 2.16 and then 3.0 would
be the master branch. Or can there be two parallel master branches?</div></blockquote><div><br></div><div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"></div><div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Its a direct reference to the Git branch name, so yes only one 'master' branch/'. The other branch will be called '3.0' unless Jürgen likes to follow GitFlow like terminology and call it 'develop'.</div></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"></div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div bgcolor="#FFFFFF" text="#000000">
<br>
One statement i don't like is "only for 3.x: not knowing when that
will ever release or" --> could we rather say "only for 3.x: not
knowing when this will release or" (take out the word "ever")<br>
<br>
I assume that we think that 3.x will happen, but we don't know when.
The current wording seems to imply that the PSC has doubts if 3.x
will ever happen - which I don't think is the case. But since this
"o-tone Jürgen", I don't know if you want to change this ...<br>
<br></div></blockquote><div><br></div><div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small">Yes that is a verbatim quote from Jürgen - I can edit it out if you feel it muddies the waters and add an ellipsis instead ("[...]")...ok with you Jürgen?</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small">Thanks for your feedback!</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"><br>Regards</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small">Tim</div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div bgcolor="#FFFFFF" text="#000000">
Andreas<div><div class="h5"><br>
<br>
<div>On 07.02.2016 22:56, Tim Sutton wrote:<br>
</div>
</div></div><blockquote type="cite"><div><div class="h5">
Hi PSC
<div><br>
</div>
<div>I have written up a draft announcement about the 3.0
plan. I am including a complete draft below.. Please let me know
if you have comments, corrections, additions to this DRAFT so
that I can post it and then advertise it more broadly.</div>
<div><br>
</div>
<div>COPY BEGINS</div>
<div>— ——— — ———— </div>
<div><br>
</div>
<div><br>
</div>
<div>QGIS 3.0 plans</div>
<div><br>
</div>
<div>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">Ok so quick spoiler here: there is no QGIS 3.0 ready
yet, nor will there be a QGIS 3.0 for some time. This article
provides a bit more detail on the plans for QGIS 3.0. A few
weeks ago I wrote about some of the considerations for the 3.0
release, so you may want to <a href="http://blog.qgis.org/2016/01/17/help-us-to-plan-for-qgis-3-0/" style="color:rgb(0,170,220)" target="_blank">read that first</a> before
continuing with this article as I do not cover the same ground
here.</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">A <strong>lot</strong> of consideration has
gone into deciding what the approach will be for the
development of QGIS 3.0. Unfortunately the first PSC
vote regarding which proposal to follow was a <a href="https://www.loomio.org/d/5MCdPwoL/vote-to-approve-the-process-for-qgis-3-0" style="color:rgb(0,170,220)" target="_blank">split</a> decision
(4 for, 3 against, 1 abstention and 1 suggestion for an
alternative in the discussion). During our PSC meeting this
week we re-tabled the topic and eventually agreed on Jürgen
Fischer's proposal (Jürgen is a QGIS PSC Member and the QGIS
Release Manager) by a much more unanimous margin of 8 for, 1
neutral and 1 absent. Jürgen's proposal is largely similar to
the Proposal 2 described in my <a href="http://blog.qgis.org/2016/01/17/help-us-to-plan-for-qgis-3-0/" style="color:rgb(0,170,220)" target="_blank">previous posting</a>.
I want to make some special notes here about our discussion
and subsequent decision which will hopefully help to clarify
the thinking behind our decision for other interested
observers. First let me lay out Jürgen's plan in his own
words:<br>
</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><span>"</span><span>My preferred
approach would still be:</span></p>
<ul style="color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">
<li><span>Do a
Qt5/PyQt5/Python3 branch in parallel, actually work on it
until it's ready, make it master and release it as 3.0</span></li>
<li><span>Meantime keep
working on master (2.x) and keep releasing them every 4
months as usual</span></li>
</ul>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><span>Everyone
can work on the branch (s)he wants (or is hired to), but
needs to consider if (s)he want to do it (or spend funds
on):</span></p>
<ul style="color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">
<li><span>only for 2.x:
knowing that it will be released soon; but might become
unusable because platforms drop support for stuff it
depends on sooner or later</span></li>
<li><span>only for 3.x:
not knowing when that will ever release or</span></li>
<li><span>for both:
knowing that work needs to be done twice.</span></li>
<li><span>People adding
features to the master branch will be responsible to
ensure that their work gets merged to 3.0 branch.</span></li>
</ul>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">As PSC we should maintain the environment for people
to do something for QGIS - but we cannot tell them to - so we
don't have resources we can actually plan with and that means
we can either release something when the big thing is ready or
what we have in fixed intervals." - Jürgen Fischer<br>
</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">What follows are some further details and
clarifications to our preferred approach:</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><strong>Why do parallel development?</strong><br>
</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">Parallel development of 3.0 maintaining our master
branch with 2.x code in it has advantages and disadvantages.
First the advantages:</p>
<ul style="color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">
<li>If we encounter major technical difficulties /
release blockers in the 3.0 branch, it will not impact on
our normal 3 monthly release cycle.</li>
<li>Our binary build systems (Linux, Windows and OSX
binaries) will be unaffected until 3.0 is ready.</li>
<li>It is very likely that building 3.0 binaries on
different platforms is going to have difficulties for each
platform. For example OSGEO4W has no Python3 and Qt5
packages yet. Someone needs to see to the creation of the
required package as a separate exercise from the actuals
development of a version of QGIS that will take advantage of
these updated libraries. We don't yes know what problems may
be in countered in preparing these.</li>
<li>"Don't break what already works": we have a
working and relatively stable master branch and we don't
want to do a 'cowboy stunt' and break it. We prefer to wait
until the 3.0 branch is mature, has passing tests and is
known to work well before merging it into master and
treating it as our 'best we currently have' master branch.</li>
</ul>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">Of course nothing in life is completely easy, there
are also some disadvantages<strong>:</strong></p>
<ul style="color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">
<li>Some developers may feel that running two
mainstream branches is dilution of effort. To counter this,
our public recommendation is that after 2.16 comes out, all
QGIS contributors are <strong>strongly encouraged</strong> to
provide their patches against the 3.0 branch.
Any features applied to the master branch is <strong>not guaranteed</strong> to be part of the 3.0
release.</li>
<li>Regular merging of master to the 3.0 branch may
prove more and more difficult over time as the two branches
diverge more. Again we will strongly encourage that
developers submitting new features after the 2.16 release do
so against the 3.0 branch.</li>
<li>3.0 branch won't have auto build system for
nightly binaries in the beginning. Since we expect that the
initial branch of 3.0 will break these anyway, Having a
separate branch is actually an advantage here as it will
give binary packages some time to get their build systems up
to speed.</li>
</ul>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><br>
</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><strong>The schedule will not be fixed:</strong></p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">One thing that we want to make really clear (and was
a key point in our many discussions) is that there will be no
fixed release date for QGIS version 3.0. There are several
reasons for this:</p>
<ul style="color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">
<li>As a steering committee, we can only set the QGIS
ship pointing in a given direction, our power to actually
make work happen is extremely limited. This is because we
are a community made up largely of volunteer developers or
developers working on a commission basis for third party
clients. We have no say in how these contributors spend
their time. </li>
<li>We do not yet know which (if any) major technical
issues will be encountered during the development of 3.0.
Any such issues could very well delay the roll our of QGIS
3.0.</li>
</ul>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">Instead our plan is to make the 2.16 release and then
effectively move all developer effort to the 3.0 branch as
best we can (through close liaison with our developer
community).</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><br>
</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><strong>Looking forward to 3.0</strong></p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">Personally I am very much looking forward to the
release of QGIS 3.0 - it represents another huge milestone in
our project, it affords us a great opportunity to get rid of a
lot of cruft out of our code base and API's and it will arm us
with a set of modern, new libraries that will see us through
the next several years. Rock on QGIS 3.0!</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><br>
</p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)"><img alt="timsutton" style="max-width: 100%;" src="cid:part4.02030104.09040402@carto.net" height="191" width="336"></p>
<p style="margin:0px 0px 24px;color:rgb(61,89,109);font-family:Merriweather,Georgia,'Times New Roman',Times,serif;font-size:15px;background-color:rgb(255,255,255)">QGIS PSC Chairman</p>
<div><br>
</div>
<div>——————</div>
<div><br>
</div>
<div>COPY ENDS</div>
<div>
<div style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;text-align:center"><span>—</span></div>
<div style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;text-align:center"><span><br>
</span></div>
<span style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><br>
<span><img src="cid:part5.04010109.01050307@carto.net" height="66" width="160"></span>
<div style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;text-align:center"><br>
<br>
</div>
<div style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;text-align:center">Tim Sutton</div>
<div style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;text-align:center"><br>
</div>
<div style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px">
<div style="text-align:center">Visit <a href="http://kartoza.com" target="_blank"></a><a href="http://kartoza.com" target="_blank">http://kartoza.com</a> to find out about open
source:</div>
<div style="text-align:center"><br>
</div>
<div>
<div style="text-align:center">* Desktop GIS
programming services</div>
<div style="text-align:center">* Geospatial
web development</div>
<div style="text-align:center">* GIS Training</div>
<div style="text-align:center">* Consulting
Services</div>
<div style="text-align:center"><br>
</div>
<div>
<div style="text-align:center">Skype:
timlinux Irc: timlinux on #qgis at <a href="http://freenode.net" target="_blank">freenode.net</a></div>
<div style="text-align:center">Tim is a
member of the QGIS Project Steering Committee</div>
<div style="text-align:center"><br>
</div>
<div style="text-align:center">Kartoza is a
merger between Linfiniti and Afrispatial</div>
</div>
</div>
</div>
</span></div>
<br>
</div>
<br>
<fieldset></fieldset>
<br>
</div></div><pre>_______________________________________________
Qgis-psc mailing list
<a href="mailto:Qgis-psc@lists.osgeo.org" target="_blank">Qgis-psc@lists.osgeo.org</a>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-psc" target="_blank">http://lists.osgeo.org/mailman/listinfo/qgis-psc</a></pre>
</blockquote>
<br>
</div>
<br>_______________________________________________<br>
Qgis-psc mailing list<br>
<a href="mailto:Qgis-psc@lists.osgeo.org">Qgis-psc@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-psc" rel="noreferrer" target="_blank">http://lists.osgeo.org/mailman/listinfo/qgis-psc</a><br></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr"><div style="text-align:center">------------------------------------------------------------------------------------------</div><div style="text-align:center"><img src="http://kartoza.com/wp-content/uploads/2014/06/KartozaWebBanner.png" width="200" height="40"></div><div style="text-align:center">Tim Sutton</div><div style="text-align:center"><span style="text-align:start">Visit </span><a href="http://kartoza.com/" style="text-align:start" target="_blank">http://kartoza.com</a><span style="text-align:start"> to find out about open source:</span><br style="text-align:start"><span style="text-align:start"> * Desktop GIS programming services</span><br style="text-align:start"><span style="text-align:start"> * Geospatial web development</span></div><div style="text-align:center"><span style="text-align:start">* GIS Training</span></div><div style="text-align:center"><span style="text-align:start">* Consulting Services</span></div><div style="text-align:center"><div style="text-align:center">Skype: timlinux Irc: timlinux on #qgis at <a href="http://freenode.net/" target="_blank">freenode.net</a></div><div style="text-align:start"><div style="text-align:center">Tim is a member of the QGIS Project Steering Committee</div><div style="text-align:center">-------------------------------------------------------------------------------------------</div><div style="text-align:center">Kartoza is a merger between Linfiniti and Afrispatial</div></div></div></div></div>
</div></div>