<div dir="ltr"><div dir="ltr">The grass7 branch of the grass-addons repo is now in the state we want and is usable. Now we need to make the official switch. Do you plan it for 7.8.6 or will leave it for 7.8.7? The other part is to redirect contributions to the grass7 branch instead of the master branch.<br></div><div><br></div><div>I will do the "Create branch (from grass7 branch) for v8 (named grass8)" step once this is settled.<br></div><div><br></div><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jun 28, 2021 at 7:44 AM Stefan Blumentrath <<a href="mailto:Stefan.Blumentrath@nina.no">Stefan.Blumentrath@nina.no</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div>
<div dir="auto" style="direction:ltr;margin:0px;padding:0px;font-family:sans-serif;font-size:11pt;color:black">
Yes. Agreed. If the master branch in addons remains unchanged, #1678 is actually not needed. For the new structure only default branch and url need to be changed in g.extension...<span id="gmail-m_-2089837487582198607ms-outlook-android-cursor"></span><br>
<br>
</div>
<div dir="auto" style="direction:ltr;margin:0px;padding:0px;font-family:sans-serif;font-size:11pt;color:black">
<span id="gmail-m_-2089837487582198607OutlookSignature">
<div dir="auto" style="direction:ltr;margin:0px;padding:0px;font-family:sans-serif;font-size:11pt;color:black">
Get <a href="https://aka.ms/AAb9ysg" target="_blank">Outlook for Android</a></div>
</span><br>
</div>
<hr style="display:inline-block;width:98%">
<div id="gmail-m_-2089837487582198607divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> Vaclav Petras <<a href="mailto:wenzeslaus@gmail.com" target="_blank">wenzeslaus@gmail.com</a>><br>
<b>Sent:</b> Monday, June 28, 2021 4:52:39 AM<br>
<b>To:</b> Stefan Blumentrath <<a href="mailto:Stefan.Blumentrath@nina.no" target="_blank">Stefan.Blumentrath@nina.no</a>><br>
<b>Cc:</b> Markus Neteler <<a href="mailto:neteler@osgeo.org" target="_blank">neteler@osgeo.org</a>>; GRASS developers list <<a href="mailto:grass-dev@lists.osgeo.org" target="_blank">grass-dev@lists.osgeo.org</a>><br>
<b>Subject:</b> Re: [GRASS-dev] [release planning] GRASS GIS 7.8.6</font>
<div> </div>
</div>
<div>
<div dir="ltr">
<div>The grass7 branch is created. See #571 for the changes in the structure.<br>
</div>
<div><br>
</div>
<div>I think releasing now without the changes and then releasing again soon with the extension changes is an okay solution.<br>
</div>
<div><br>
</div>
<div><a href="https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FOSGeo%2Fgrass-addons%2Fpull%2F571&data=04%7C01%7C%7C627e339a226a4cc111dd08d939dfd5b8%7C6cef373021314901831055b3abf02c73%7C0%7C0%7C637604455797232144%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=P3vLWcLCqZTC8JreGeyWeZtIV75ceRV7yr9Fp0zsbnA%3D&reserved=0" target="_blank">https://github.com/OSGeo/grass-addons/pull/571</a></div>
</div>
<br>
<div>
<div dir="ltr">On Thu, Jun 24, 2021 at 4:12 AM Stefan Blumentrath <<a href="mailto:Stefan.Blumentrath@nina.no" target="_blank">Stefan.Blumentrath@nina.no</a>> wrote:<br>
</div>
<blockquote style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div lang="NO-BOK">
<div>
<p><span>Hi,<u></u><u></u></span></p>
<p><span><u></u> <u></u></span></p>
<p><span lang="EN-US">As for the changes in g.extension, I think they are necessary as e.g. here:<u></u><u></u></span></p>
<p><span lang="EN-US"><a href="https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FOSGeo%2Fgrass%2Fblob%2F70e0c0ef9c7ce4e971c5197a4010ce5eaf354433%2Fscripts%2Fg.extension%2Fg.extension.py%23L1615&data=04%7C01%7C%7C627e339a226a4cc111dd08d939dfd5b8%7C6cef373021314901831055b3abf02c73%7C0%7C0%7C637604455797242137%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=jv9bDIOxxBuYlqmQ0QoTGi1RL5gY6w8DEdZlsshiCpg%3D&reserved=0" target="_blank">https://github.com/OSGeo/grass/blob/70e0c0ef9c7ce4e971c5197a4010ce5eaf354433/scripts/g.extension/g.extension.py#L1615</a><u></u><u></u></span></p>
<p><span lang="EN-US">“grass7” is hardcoded in the URL.<u></u><u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<p><span lang="EN-US">A solution would be to first check if the "source_url" with "grass7"
<u></u><u></u></span></p>
<p><span lang="EN-US">(<a href="https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FOSGeo%2Fgrass-addons%2Ftree%2Fmaster%2Fgrass7%2F&data=04%7C01%7C%7C627e339a226a4cc111dd08d939dfd5b8%7C6cef373021314901831055b3abf02c73%7C0%7C0%7C637604455797242137%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2BiEDQQMt5GjbsmcieDTMNX8Q%2FmaiHo4uZEDt97rXbPY%3D&reserved=0" target="_blank">https://github.com/OSGeo/grass-addons/tree/master/grass7/</a>)
exists and otherwise assign the new URL without "grass7".<u></u><u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<p><span lang="EN-US">As Vasek points out, first a decision has to be made about the final URL (or branch) in<u></u><u></u></span></p>
<p><span lang="EN-US"><a href="https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FOSGeo%2Fgrass-addons%2Fissues%2F528&data=04%7C01%7C%7C627e339a226a4cc111dd08d939dfd5b8%7C6cef373021314901831055b3abf02c73%7C0%7C0%7C637604455797252134%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=LF97gZc5dw4p0QJnK%2FG0YuWA6amnVbKsPcrNMJ%2FQiNc%3D&reserved=0" target="_blank">https://github.com/OSGeo/grass-addons/issues/528</a><u></u><u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<p><span lang="EN-US">Here:<u></u><u></u></span></p>
<p><span lang="EN-US"><a href="https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FOSGeo%2Fgrass%2Fpull%2F1678&data=04%7C01%7C%7C627e339a226a4cc111dd08d939dfd5b8%7C6cef373021314901831055b3abf02c73%7C0%7C0%7C637604455797252134%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=AeDJN8rFmLklWnwr9jCK3V6k4UFMbBWln0TJXRdk3zE%3D&reserved=0" target="_blank">https://github.com/OSGeo/grass/pull/1678</a><u></u><u></u></span></p>
<p><span lang="EN-US">is a draft PR for a possible approach to this. It may have to be backported to 7.6 or even 7.4?<u></u><u></u></span></p>
<p><span lang="EN-US">g.extension in G7.8 already supports branches, so if there will be a branch for different versions, that should be easy to adjust in g.extension.<u></u><u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<p><span lang="EN-US">We should probably wait a bit with restructuring the addon repo until a modified version of g.extension has been packaged for the most essential OS/distros at least…<u></u><u></u></span></p>
<p><span lang="EN-US">See: <a href="https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Frepology.org%2Fproject%2Fgrass%2Fversions&data=04%7C01%7C%7C627e339a226a4cc111dd08d939dfd5b8%7C6cef373021314901831055b3abf02c73%7C0%7C0%7C637604455797262129%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=IH%2FnRZt1c8nk8jK5Al9VFXb1VW56e%2FuDDtDyJM1GpiA%3D&reserved=0" target="_blank">
https://repology.org/project/grass/versions</a><u></u><u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<p><span lang="EN-US">g.extension in G8 can then be streamlined to the new repo structure…<u></u><u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<p><span lang="EN-US">Cheers<u></u><u></u></span></p>
<p><span lang="EN-US">Stefan<u></u><u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<p><span lang="EN-US"><u></u> <u></u></span></p>
<div style="border-color:rgb(225,225,225) currentcolor currentcolor;border-style:solid none none;border-width:1pt medium medium;padding:3pt 0cm 0cm">
<p><b><span lang="EN-US">From:</span></b><span lang="EN-US"> grass-dev <<a href="mailto:grass-dev-bounces@lists.osgeo.org" target="_blank">grass-dev-bounces@lists.osgeo.org</a>>
<b>On Behalf Of </b>Vaclav Petras<br>
<b>Sent:</b> torsdag 24. juni 2021 04:45<br>
<b>To:</b> Markus Neteler <<a href="mailto:neteler@osgeo.org" target="_blank">neteler@osgeo.org</a>><br>
<b>Cc:</b> GRASS developers list <<a href="mailto:grass-dev@lists.osgeo.org" target="_blank">grass-dev@lists.osgeo.org</a>><br>
<b>Subject:</b> Re: [GRASS-dev] [release planning] GRASS GIS 7.8.6<u></u><u></u></span></p>
</div>
<p><u></u> <u></u></p>
<div>
<div>
<p><u></u> <u></u></p>
</div>
<p><u></u> <u></u></p>
<div>
<div>
<p>On Wed, Jun 23, 2021 at 7:58 AM Markus Neteler <<a href="mailto:neteler@osgeo.org" target="_blank">neteler@osgeo.org</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0cm 0cm 0cm 6pt;margin-left:4.8pt;margin-right:0cm">
<p><br>
Important question: with the planned Addon repo structure affect<br>
g.extension of G7?<u></u><u></u></p>
</blockquote>
<div>
<p><u></u> <u></u></p>
</div>
<div>
<p>If we want to make backports from v8 to v7 addons easier, then we need to create another branch for v7 (besides the one for v8) and restructure v7 as we did v6 and will restructure the v8 branch.<u></u><u></u></p>
</div>
<div>
<p><u></u> <u></u></p>
</div>
<div>
<p>The master branch would stay as a read-only legacy in this scenario. The alternative is leaving the master branch for v7.<u></u><u></u></p>
</div>
<div>
<p><u></u> <u></u></p>
</div>
<p><a href="https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FOSGeo%2Fgrass-addons%2Fissues%2F528&data=04%7C01%7C%7C627e339a226a4cc111dd08d939dfd5b8%7C6cef373021314901831055b3abf02c73%7C0%7C0%7C637604455797262129%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=x3YPmwXFgnnw28CDGzIEyHEszSupsCBNo4GWQB91j7M%3D&reserved=0" target="_blank">https://github.com/OSGeo/grass-addons/issues/528</a><u></u><u></u></p>
</div>
</div>
</div>
</div>
</blockquote>
</div>
</div>
</div>
</blockquote></div></div>