Skip to content

Commit

Permalink
Test more ROOT/Python versions, Prepare release 22.11 (#29)
Browse files Browse the repository at this point in the history
* Test more ROOT/Python versions
* Prepare release 22.11
* Fix ROOT includes on some Systems
  • Loading branch information
janmayer authored Oct 31, 2022
1 parent 98f7a6d commit 22c4a28
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
# - '6.22.4' was a broken release
# - '6.26.2' with python '3.10' results in unsolvable conda conflicts as of 2022-05-05.
python-version: ['3.7', '3.8', '3.9', '3.10']
root-version: ['6.24.0', '6.24.2', '6.24.4', '6.24.6', '6.26.0', '6.26.2']
root-version: ['6.24.0', '6.24.2', '6.24.4', '6.24.6', '6.26.0', '6.26.2', '6.26.4', '6.26.6','6.26.8']
exclude:
- python-version: '3.10'
root-version: '6.24.0'
Expand Down
8 changes: 7 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# HDTV Changelog

## 22.11
- New Feature: Fit option onlypositivepeaks (@j-kleemann)
- New Feature: Position recalibrate with peak selection (@j-kleemann)
- New Feature: Notification option when end of spectra list is reached (@j-kleemann)
- Misc. fixes and many quality-of-life improvements (@j-kleemann)

## 22.04
- Natural sorting of spectra for `spectrum get` (@jkleemann)
- Natural sorting of spectra for `spectrum get` (@j-kleemann)
- calbin for negative-energy bins and related improvements (@ufrimangayer)
- Support for ROOT 6.26 (@opapst)
- General build system and tooling improvements (@opapst)
Expand Down
6 changes: 5 additions & 1 deletion hdtv/rootext/fit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ set_target_properties(
"${CMAKE_CURRENT_BINARY_DIR}/lib${PROJECT_NAME}.rootmap;${CMAKE_CURRENT_BINARY_DIR}/lib${PROJECT_NAME}_rdict.pcm"
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME} ROOT::Core ROOT::Hist)
target_link_libraries(
${PROJECT_NAME}
ROOT::Core
ROOT::Hist
ROOT::MathMore)

install(
TARGETS ${PROJECT_NAME}
Expand Down

0 comments on commit 22c4a28

Please sign in to comment.