Merge branch 'developer' into dev/roi_per_port

This commit is contained in:
2025-06-16 22:12:02 +02:00
6 changed files with 70 additions and 15 deletions

64
.github/workflows/build_wheel.yml vendored Normal file
View File

@ -0,0 +1,64 @@
name: Build wheel
on:
workflow_dispatch:
pull_request:
push:
branches:
- main
release:
types:
- published
jobs:
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest,]
steps:
- uses: actions/checkout@v4
- name: Build wheels
run: pipx run cibuildwheel==2.23.0
- uses: actions/upload-artifact@v4
with:
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
path: ./wheelhouse/*.whl
build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build sdist
run: pipx run build --sdist
- uses: actions/upload-artifact@v4
with:
name: cibw-sdist
path: dist/*.tar.gz
upload_pypi:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
environment: pypi
permissions:
id-token: write
if: github.event_name == 'release' && github.event.action == 'published'
# or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
steps:
- uses: actions/download-artifact@v4
with:
# unpacks all CIBW artifacts into dist/
pattern: cibw-*
path: dist
merge-multiple: true
- uses: pypa/gh-action-pypi-publish@release/v1

View File

@ -116,7 +116,9 @@ template <typename T, size_t Capacity> class StaticVector {
iterator end() noexcept { return data_.begin() + current_size; } iterator end() noexcept { return data_.begin() + current_size; }
const_iterator end() const noexcept { return data_.begin() + current_size; } const_iterator end() const noexcept { return data_.begin() + current_size; }
const_iterator cbegin() const noexcept { return data_.cbegin(); } const_iterator cbegin() const noexcept { return data_.cbegin(); }
const_iterator cend() const noexcept { return data_.cbegin()+current_size; } const_iterator cend() const noexcept {
return data_.cbegin() + current_size;
}
void size_check(size_type s) const { void size_check(size_type s) const {
if (s > Capacity) { if (s > Capacity) {

View File

@ -10,4 +10,3 @@
#define APIXILINXCTB "0.0.0 0x250523" #define APIXILINXCTB "0.0.0 0x250523"
#define APIJUNGFRAU "0.0.0 0x250523" #define APIJUNGFRAU "0.0.0 0x250523"
#define APIMYTHEN3 "0.0.0 0x250523" #define APIMYTHEN3 "0.0.0 0x250523"

View File

@ -5,12 +5,7 @@
namespace sls { namespace sls {
std::string ToString(bool value) { return value ? "1" : "0"; }
std::string ToString(bool value) {
return value ? "1" : "0";
}
std::string ToString(const slsDetectorDefs::xy &coord) { std::string ToString(const slsDetectorDefs::xy &coord) {
std::ostringstream oss; std::ostringstream oss;

View File

@ -8,15 +8,12 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
using sls::StaticVector; using sls::StaticVector;
TEST_CASE("StaticVector is a container") { TEST_CASE("StaticVector is a container") {
REQUIRE(sls::is_container<StaticVector<int, 7>>::value == true); REQUIRE(sls::is_container<StaticVector<int, 7>>::value == true);
} }
TEST_CASE("Comparing StaticVector containers") { TEST_CASE("Comparing StaticVector containers") {
StaticVector<int, 5> a{0, 1, 2}; StaticVector<int, 5> a{0, 1, 2};
StaticVector<int, 5> b{0, 1, 2}; StaticVector<int, 5> b{0, 1, 2};
@ -344,4 +341,3 @@ TEST_CASE("StaticVector stream") {
oss << vec; oss << vec;
REQUIRE(oss.str() == "[33, 85667, 2]"); REQUIRE(oss.str() == "[33, 85667, 2]");
} }

View File

@ -26,7 +26,6 @@ TEST_CASE("Convert string to bool", "[support]") {
REQUIRE(StringTo<bool>("0") == false); REQUIRE(StringTo<bool>("0") == false);
} }
TEST_CASE("Integer conversions", "[support]") { TEST_CASE("Integer conversions", "[support]") {
REQUIRE(ToString(0) == "0"); REQUIRE(ToString(0) == "0");
REQUIRE(ToString(1) == "1"); REQUIRE(ToString(1) == "1");