Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cmake build: merge upstream/main #2

Closed
wants to merge 175 commits into from

Conversation

lbartoletti
Copy link

Merge upstream/main and fix conflicts

wenzeslaus and others added 30 commits February 14, 2023 11:00
Disable a test of a known (unfixed) bug in the config files to avoid failing the CI before the bug is fixed.
* Removes imports from six, uses standard Python 3 imports.
* Removes Python <=2.4 ElementTree import.
* Removes future print_function imports.

Removes six only from g.extension and g.extension.all. Leaves the rest as is.
* Report Matthews (Mattheus) Correlation Coefficient as one of measures
* Use the Neumaier's Kahan-Babuska algorithm to minimize errors during summation
Sometimes two files in the repo need to be the same. Various Dockerfiles are in docker directory, but having a (the one) Dockerfile in the main directly makes sense, too. A new check enforces that the file in synced with the other copy.
…r3.out.vtk, v.out.vtk) (OSGeo#2343)

r.out.vtk, r3.out.vtk, and v.out.vtk include software name in the VTK header line for the 'exported from' description text. This removes the hard-coded major version from the string and uses the current major version instead.
The error message about missing database connection for a given layer does not include vector name which may not be clear when scripting or when getting the errors from underlying calls to v.info.
The clang-format shell script replaces the grass_indent.sh and
grass_indent_ALL.sh scripts, which are both hereby removed.
Addresses following Python deprecation warnings:
* "DeprecationWarning: invalid escape sequence"
* "DeprecationWarning: Menu.Append() is deprecated"
HTMLParseError is just an alias for Exception. There is no HTMLParseError in Python 3. The error reporting fails because of access to attributes.

This completely removes HTMLParseError from HTML-man conversion code. The HTMLParseError included attributes about the error, but now the parsing is not strict anymore, so there is nothing to report.

Additionally, removes import code for Python 2.
When the save method receives a path, ensure the path is pathlib.Path, then use its functions to detect file suffix (extension) instead of manipulating strings. PIL.Image supports Path for 8 years, so we can support that and get the string support by conversion to Path.

In tests, use tmp_path, not current dir. Files generated by the tests should use tmp_path (or other pytest tmp dir ways), not the current directory.
…2342)

r3.out.netcdf creates a netCDF file with attribute history which contains software. This removes the hard-coded software version information and uses the current major version instead for the history text. It uses fairly general macros to encapsulate stringification to avoid complex code needed to use snprintf.

The documentation contains the output, so the version should be there, but I removed it from the examples to avoid the need for updates (making the documentation little less precise).
…history file (OSGeo#1072)

* wxGUI/gconsole: fix saving command param arg with quotation marks to history file .bash_history

e.g. db.select sql="SELECT * FROM census WHERE cat < 5"
Fixes OSGeo#2678 by avoiding unnecessary nsew <-> row,col conversions
Updates submitting guidelines, following recent additions of clang-format and pre-commit.
The multi-window layout is/was using just Data which worked well, so this changes the label of the pane/panel to just Data for simplicity and consistency. Now both the top caption and notebook page label (if in a notebook) are Data.

Makes all pane captions translatable.
* r.stats.zonal manual: add figure to illustrate module functionality along with jupyter notebook
* r.series: bugfix for labeling
* v.random: use unqualified names in db columns

Fixes OSGeo#2473

* v.random: replace sprintf with snprintf

Co-authored-by: Nicklas Larsson <n_larsson@yahoo.com>
Address integer overflow in call to Rast_set_null_value()
by instead looping over rows and set rows to NULL.

Solution by:
Co-authored-by: Markus Metz <markus.metz.giswork@gmail.com>
* update simple.laz to LAZ > 1.0:
    * reformatted with `las2las -i simple.laz -o simple_new.laz ; mv simple_new.laz simple.laz` to avoid PDAL/laz-perf error in LAZ chunk table

(original file: https://github.com/PDAL/PDAL/blob/master/test/data/laz/simple.laz)
Mirrors fix in 75cb8f6

Address integer overflow in call to Rast_set_null_value()
by instead looping over rows and set rows to NULL.

Solution by:
Co-authored-by: Markus Metz <markus.metz.giswork@gmail.com>
PDAL 2.5.1+ header files included in GRASS causes Clang compiler warnings.
…SGeo#2853)

* r.neighbors, r.resamp.filter, r.resamp.interp: fix integer overflow
The pdal-config, which we used so far is not actively maintained,
pkg-config is the recommended way to configure for use of PDAL.

Configure flags are simplified, either  '--with-pdal' or '--without-pdal'.

CI runners are updated to reflect this change.
Change to multiline string type (literal) with no need of the somewhat
ambiguous use of blank lines as line brake.
Fixed typos in entire source code tree using `utils/fix_typos.sh`:

- typos fixed in C/CPP, Python, HTML, Markdown, other text files
- gettext messages updated accordingly to not break translations
- gettext `.pot` files regenerated:
    -  `cd locale/po/`
    - `make pot`
- `.po` files trimmed for (now) duplicate messages and unused fuzzy messages:
    -  `cd locale/po/`
    - `for i in `ls gr*.po` ; do POFILE=$i ; msgattrib --output-file=$i --no-obsolete $POFILE ; done`
- updated `utils/fix_typos.sh`
@neteler
Copy link
Owner

neteler commented Oct 4, 2023

May this PR in my fork be closed?

@lbartoletti
Copy link
Author

May this PR in my fork be closed?

Yes, thanks for the initial work!

@lbartoletti lbartoletti closed this Oct 5, 2023
@neteler
Copy link
Owner

neteler commented Oct 5, 2023

Thanks for your continuation!

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