Merge branch 24.04 --> master (#1904)
#1942
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Changes to support building on Ubuntu 24.04 and windows-2022 Github runner.
* Update Python to 3.12
* Install dependencies in virtual environment
* Run python scripts from the virtual environment)
* Update dependencies
* Ubuntu dependencies in snap/snapcraft24.yaml
* Python dependencies in requirements.txt
* Windows dependencies built in OpenDroneMap/windows-deps repo
* Update CUDA
* 12.8.1 on Windows
* 13.0.0 on Ubuntu)
* Run tests as part of docker build
* Use exact commits to specify dependencies that are built from source, instead of branch names
* Use upstream versions of Libraries:
* PDAL
* PDAL-Python
* untwine
* ExifRead
* draco
* Build windows builds with -j2
* Use Micasense's latest version of dls.py
* Update failing unit tests to match current behavior
7 tasks
Contributor
|
Thanks @spwoodcock. |
Member
Author
|
Damn, somehow this PR ended up swapping the commit ownership from you to me 😮 I definitely can't take credit for the 24.04 branch! |
Contributor
|
All (most of) the commits should be credited to @NathanMOlson |
Member
Author
|
Ah my bad - I was checking on my phone - on the web client it correctly shows the authored by you, commited by me 👍 For @NathanMOlson to be the commit author, we might have to revert the original #1904 and do a merge commit instead of squash and merge 😅 Sorry to be the bearer of bad news! |
Contributor
|
We need to either resolve #1949 or revert this and then resolve 1949. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As mentioned in #1904, we can merge the latest release into master.
After that I can start #1936
To clarify, this is based on Ubuntu 24.04, but the new ODM version is 3.6.0.