Skip to content

Comments

CI: fix wrong indent style and OSGeo4W compilation (G84)#6468

Merged
echoix merged 2 commits intoOSGeo:releasebranch_8_4from
neteler:fix_wrong_indent_style
Oct 9, 2025
Merged

CI: fix wrong indent style and OSGeo4W compilation (G84)#6468
echoix merged 2 commits intoOSGeo:releasebranch_8_4from
neteler:fix_wrong_indent_style

Conversation

@neteler
Copy link
Member

@neteler neteler commented Oct 8, 2025 •
edited
Loading

This PR fixes

  • spurious tab indentations in releasebranch_8_4.
  • also the OSGeo4W compilation

Needed for CI runs and pre-commit.

@neteler
CI: fix wrong indent style (G84)
6948e45 
This PR fixes spurious tab indentations.
Needed for `pre-commit`.
@neteler neteler added this to the 8.4.2 milestone Oct 8, 2025
@neteler neteler self-assigned this Oct 8, 2025
@neteler neteler added the CI Continuous integration label Oct 8, 2025
@github-actions github-actions bot added vector Related to vector data processing raster Related to raster data processing Python Related code is in Python module tests Related to Test Suite labels Oct 8, 2025
@echoix
Copy link
Member

echoix commented Oct 8, 2025 •
edited
Loading

Windows failure: backport #6464. You may try it directly, it’s pretty safe as it was already a virtual package for a while

@neteler
Copy link
Member Author

neteler commented Oct 8, 2025

Windows failure: backport #6464. You may try it directly, it’s pretty safe as it was already a virtual package for a while

Cherry-picking 26a1723 leads to conflicts as the osgeo4w.yml files quite differ. So it would require a new PR. What is preferred?

@echoix
Copy link
Member

echoix commented Oct 8, 2025

Windows failure: backport #6464. You may try it directly, it’s pretty safe as it was already a virtual package for a while

Cherry-picking 26a1723 leads to conflicts as the osgeo4w.yml files quite differ. So it would require a new PR. What is preferred?

Manually remove the -git from …-libre-git package then in the package list installed

@neteler
Copy link
Member Author

neteler commented Oct 8, 2025

Now only this MacOS CI error remains:

 Running ./raster/r.texture/testsuite/test_texture.py...
========================================================================
...........F.
======================================================================
FAIL: test_sv (__main__.TestRasterreport.test_sv)
Testing method sv
----------------------------------------------------------------------
Traceback (most recent call last):
  File "raster/r.texture/testsuite/test_texture.py", line 144, in test_sv
    self.assertRasterFitsUnivar(output, reference=values, precision=1e-2)
  File "etc/python/grass/gunittest/case.py", line 289, in assertRasterFitsUnivar
    self.assertModuleKeyValue(
  File "etc/python/grass/gunittest/case.py", line 271, in assertModuleKeyValue
    self.fail(self._formatMessage(msg, stdMsg))
AssertionError: r.univar map=sv_SV percentile=90.0 nprocs=1 separator== -g difference:
mismatch values (key, reference, actual): [('max', 45368496, 45368492), ('mean', 2248724.38215788, 2248724.35922656), ('variance', 2332049495199.41, 2332049429651.92)]
command: r.univar map=sv_SV percentile=90.0 nprocs=1 separator== -g {'map': 'sv_SV', 'separator': '=', 'flags': 'g'}

----------------------------------------------------------------------
Ran 13 tests in 16.697s
FAILED (failures=1)
========================================================================
FAILED ./raster/r.texture/testsuite/test_texture.py (1 test failed)

@neteler
Copy link
Member Author

neteler commented Oct 8, 2025 •
edited
Loading

Looks like #5750 to be backported, too? (maybe a question for e.g. @nilason)

@wenzeslaus
Copy link
Member

wenzeslaus commented Oct 8, 2025

Assuming r.univar is the issue, it depends on what you want for 8.4. Delete the test function/file or change the code? I'm fine with both for 8.4, for example.

@neteler neteler changed the title CI: fix wrong indent style (G84) CI: fix wrong indent style and OSGeo4W compilation (G84) Oct 8, 2025
@echoix
Copy link
Member

echoix commented Oct 9, 2025

The macOS r.texture failure is also in the already backported commit in releasebranch_8_4, so this PR is not adding a new problem, but fixing some. Merging as is.

@echoix echoix merged commit 40f3e44 into OSGeo:releasebranch_8_4 Oct 9, 2025
25 of 26 checks passed
@neteler
Copy link
Member Author

neteler commented Oct 10, 2025

Merging as is.

Mhh. I just had spent some hours on this... now wasted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@echoix echoix echoix approved these changes

Assignees

@neteler neteler

Labels

CI Continuous integration module Python Related code is in Python raster Related to raster data processing tests Related to Test Suite vector Related to vector data processing

Projects

None yet

Milestone

8.4.2

Development

Successfully merging this pull request may close these issues.

3 participants

@neteler @echoix @wenzeslaus