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...
Get Outlook for Android<https://aka.ms/AAb9ysg> ________________________________ From: Vaclav Petras <wenzesl...@gmail.com> Sent: Monday, June 28, 2021 4:52:39 AM To: Stefan Blumentrath <stefan.blumentr...@nina.no> Cc: Markus Neteler <nete...@osgeo.org>; GRASS developers list <grass-dev@lists.osgeo.org> Subject: Re: [GRASS-dev] [release planning] GRASS GIS 7.8.6 The grass7 branch is created. See #571 for the changes in the structure. I think releasing now without the changes and then releasing again soon with the extension changes is an okay solution. https://github.com/OSGeo/grass-addons/pull/571<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> On Thu, Jun 24, 2021 at 4:12 AM Stefan Blumentrath <stefan.blumentr...@nina.no<mailto:stefan.blumentr...@nina.no>> wrote: Hi, As for the changes in g.extension, I think they are necessary as e.g. here: https://github.com/OSGeo/grass/blob/70e0c0ef9c7ce4e971c5197a4010ce5eaf354433/scripts/g.extension/g.extension.py#L1615<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> “grass7” is hardcoded in the URL. A solution would be to first check if the "source_url" with "grass7" (https://github.com/OSGeo/grass-addons/tree/master/grass7/<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>) exists and otherwise assign the new URL without "grass7". As Vasek points out, first a decision has to be made about the final URL (or branch) in https://github.com/OSGeo/grass-addons/issues/528<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> Here: https://github.com/OSGeo/grass/pull/1678<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> is a draft PR for a possible approach to this. It may have to be backported to 7.6 or even 7.4? 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. 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… See: https://repology.org/project/grass/versions<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> g.extension in G8 can then be streamlined to the new repo structure… Cheers Stefan From: grass-dev <grass-dev-boun...@lists.osgeo.org<mailto:grass-dev-boun...@lists.osgeo.org>> On Behalf Of Vaclav Petras Sent: torsdag 24. juni 2021 04:45 To: Markus Neteler <nete...@osgeo.org<mailto:nete...@osgeo.org>> Cc: GRASS developers list <grass-dev@lists.osgeo.org<mailto:grass-dev@lists.osgeo.org>> Subject: Re: [GRASS-dev] [release planning] GRASS GIS 7.8.6 On Wed, Jun 23, 2021 at 7:58 AM Markus Neteler <nete...@osgeo.org<mailto:nete...@osgeo.org>> wrote: Important question: with the planned Addon repo structure affect g.extension of G7? 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. The master branch would stay as a read-only legacy in this scenario. The alternative is leaving the master branch for v7. https://github.com/OSGeo/grass-addons/issues/528<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>
_______________________________________________ grass-dev mailing list grass-dev@lists.osgeo.org https://lists.osgeo.org/mailman/listinfo/grass-dev
