Skip to content

Commit

Permalink
Add Python 3.8 and 3.12 to test matrix (#62)
Browse files Browse the repository at this point in the history
* Add Python 3.12 to test matrix

* Try adding libgcc dependency on Windows

* Revert "Try adding libgcc dependency on Windows"

This reverts commit 7def5c3.

* Try showing libdelaunator deps on Windows

* Also show deps using dumpbin

* Revert "Also show deps using dumpbin"

This reverts commit 9c61016.

* Try loading libdelaunator.dll with winmode=0

* Cleaner winmode

* Also try re-adding Python 3.8
  • Loading branch information
plimkilde authored Mar 25, 2024
1 parent 782b984 commit a37a74b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
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
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
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

0 comments on commit a37a74b

Please sign in to comment.