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.

Sign up for GitHub

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

Add Python 3.8 and 3.12 to test matrix #62

Merged
merged 9 commits into from
Mar 25, 2024
Merged

Add Python 3.8 and 3.12 to test matrix #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bd9334d
Add Python 3.12 to test matrix
plimkilde Mar 25, 2024
7def5c3
Try adding libgcc dependency on Windows
plimkilde Mar 25, 2024
0cfb22f
Revert "Try adding libgcc dependency on Windows"
plimkilde Mar 25, 2024
06bd8cc
Try showing libdelaunator deps on Windows
plimkilde Mar 25, 2024
9c61016
Also show deps using dumpbin
plimkilde Mar 25, 2024
7b709ad
Revert "Also show deps using dumpbin"
plimkilde Mar 25, 2024
bdb661a
Try loading libdelaunator.dll with winmode=0
plimkilde Mar 25, 2024
5503125
Cleaner winmode
plimkilde Mar 25, 2024
7c9427d
Also try re-adding Python 3.8
plimkilde Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v2
Expand All @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v2
Expand All @@ -50,6 +50,8 @@ jobs:
shell: cmd /C CALL {0}
run: >-
python src/build/build.py -v -x64 -force -cc gcc -cxx g++
- name: Show libdelaunator dependencies
run: ldd qc/thatsDEM/lib/libdelaunator.dll
- name: Test with pytest
shell: cmd /C CALL {0}
run: >-
Expand Down
2 changes: 1 addition & 1 deletion qc/thatsDEM/triangle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
delaunator_lib_name = os.path.join(LIBDIR, DELAUNATOR_LIBNAME)
# Load library directly via ctypes. Could also have used the numpy interface.
lib = ctypes.cdll.LoadLibrary(lib_name)
delaunator_lib = ctypes.cdll.LoadLibrary(delaunator_lib_name)
delaunator_lib = ctypes.CDLL(delaunator_lib_name, winmode=ctypes.RTLD_GLOBAL)
# Args and return types of c functions. Corresponds to a header file.
lib.free_index.restype = None
lib.free_index.argtypes = [ctypes.c_void_p]
Expand Down
3 changes: 2 additions & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Derived datasets suchs as DEMs and vector geometries can be extracted from a poi

## Requirements ##

DHMQC is currently supported on Windows and Linux, with Python versions 3.9, 3.10 and 3.11. The recommended way of installing DHMQC is using a Conda environment.
DHMQC is currently supported on Windows and Linux, with Python versions 3.8 through 3.12. The recommended way of
installing DHMQC is using a Conda environment.

Installation requires a C and C++ compiler. Currently, only `gcc`/`g++` are supported (on Windows via MinGW-w64).

Expand Down
Loading