From f44ae8e6a97f826187913739fbc6bac5fa49eaeb Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Wed, 28 Apr 2021 07:45:56 +0200 Subject: [PATCH 1/5] Version bump to 2.1.2 --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 2 +- include/SI/absorbed_dose.h | 2 +- include/SI/acceleration.h | 2 +- include/SI/angle.h | 2 +- include/SI/area.h | 2 +- include/SI/astronomic.h | 2 +- include/SI/catalytic_activity.h | 2 +- include/SI/detail/cross_unit_operations.h | 2 +- include/SI/detail/detail.h | 2 +- include/SI/detail/eps_equal.h | 2 +- include/SI/detail/number_parser.h | 2 +- include/SI/detail/operator_helpers.h | 2 +- include/SI/detail/unit.h | 2 +- include/SI/detail/unit_cast.h | 2 +- include/SI/detail/unit_symbol.h | 2 +- include/SI/electric_capacity.h | 2 +- include/SI/electric_charge.h | 2 +- include/SI/electric_conductance.h | 2 +- include/SI/electric_current.h | 2 +- include/SI/electric_potential.h | 2 +- include/SI/electric_resistance.h | 2 +- include/SI/energy.h | 2 +- include/SI/equivalent_dose.h | 2 +- include/SI/force.h | 2 +- include/SI/frequency.h | 2 +- include/SI/illuminance.h | 2 +- include/SI/inductance.h | 2 +- include/SI/length.h | 2 +- include/SI/luminosity.h | 2 +- include/SI/luminous_flux.h | 2 +- include/SI/magnetic_field.h | 2 +- include/SI/magnetic_flux.h | 2 +- include/SI/mass.h | 2 +- include/SI/momentum.h | 2 +- include/SI/power.h | 2 +- include/SI/pressure.h | 2 +- include/SI/radioactivity.h | 2 +- include/SI/solid_angle.h | 2 +- include/SI/stream.h | 2 +- include/SI/substance.h | 2 +- include/SI/temperature.h | 2 +- include/SI/time.h | 2 +- include/SI/velocity.h | 2 +- 44 files changed, 47 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba3d326f..fc719842 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.1.2 + +* Update to catch 2.13.6 in the conan recipes + ## 2.1.1 * Tests are built without the need for conan if catch2 is found. (using conan is still the preferred way) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3193663c..4d6b2391 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12) project( "SI" - VERSION 2.1.1 + VERSION 2.1.2 DESCRIPTION "A header only c++ library that provides type safety and user defined literals for handling pyhsical values defined in the International System of Units." HOMEPAGE_URL "https://github.com/bernedom/SI" diff --git a/include/SI/absorbed_dose.h b/include/SI/absorbed_dose.h index 95308d9c..bbea1ff0 100644 --- a/include/SI/absorbed_dose.h +++ b/include/SI/absorbed_dose.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/acceleration.h b/include/SI/acceleration.h index c1485306..a7bbd54f 100644 --- a/include/SI/acceleration.h +++ b/include/SI/acceleration.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/angle.h b/include/SI/angle.h index 54314877..18121b0b 100644 --- a/include/SI/angle.h +++ b/include/SI/angle.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/area.h b/include/SI/area.h index 547d65ff..ece89015 100644 --- a/include/SI/area.h +++ b/include/SI/area.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/astronomic.h b/include/SI/astronomic.h index d0c9974c..eb96c364 100644 --- a/include/SI/astronomic.h +++ b/include/SI/astronomic.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/catalytic_activity.h b/include/SI/catalytic_activity.h index ce891c31..b773a9a7 100644 --- a/include/SI/catalytic_activity.h +++ b/include/SI/catalytic_activity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/cross_unit_operations.h b/include/SI/detail/cross_unit_operations.h index e283b30a..8bc4e252 100644 --- a/include/SI/detail/cross_unit_operations.h +++ b/include/SI/detail/cross_unit_operations.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/detail.h b/include/SI/detail/detail.h index 6f77ac31..b149d73c 100644 --- a/include/SI/detail/detail.h +++ b/include/SI/detail/detail.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/eps_equal.h b/include/SI/detail/eps_equal.h index 58833b18..2d434ce0 100644 --- a/include/SI/detail/eps_equal.h +++ b/include/SI/detail/eps_equal.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/number_parser.h b/include/SI/detail/number_parser.h index c56aab8d..2645c36d 100644 --- a/include/SI/detail/number_parser.h +++ b/include/SI/detail/number_parser.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/operator_helpers.h b/include/SI/detail/operator_helpers.h index 6b23b2a9..98aedad0 100644 --- a/include/SI/detail/operator_helpers.h +++ b/include/SI/detail/operator_helpers.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/unit.h b/include/SI/detail/unit.h index 4bf0ef24..5ef86f95 100644 --- a/include/SI/detail/unit.h +++ b/include/SI/detail/unit.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/unit_cast.h b/include/SI/detail/unit_cast.h index 0c63d07b..3d16149c 100644 --- a/include/SI/detail/unit_cast.h +++ b/include/SI/detail/unit_cast.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/detail/unit_symbol.h b/include/SI/detail/unit_symbol.h index 1bef0651..0368f386 100644 --- a/include/SI/detail/unit_symbol.h +++ b/include/SI/detail/unit_symbol.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/electric_capacity.h b/include/SI/electric_capacity.h index f676d517..a67fdb39 100644 --- a/include/SI/electric_capacity.h +++ b/include/SI/electric_capacity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/electric_charge.h b/include/SI/electric_charge.h index 15d27236..61574e1a 100644 --- a/include/SI/electric_charge.h +++ b/include/SI/electric_charge.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/electric_conductance.h b/include/SI/electric_conductance.h index 52feb124..1ce32cd7 100644 --- a/include/SI/electric_conductance.h +++ b/include/SI/electric_conductance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/electric_current.h b/include/SI/electric_current.h index 86f05223..f5555623 100644 --- a/include/SI/electric_current.h +++ b/include/SI/electric_current.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/electric_potential.h b/include/SI/electric_potential.h index 1d42c93d..7b8f9f82 100644 --- a/include/SI/electric_potential.h +++ b/include/SI/electric_potential.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/electric_resistance.h b/include/SI/electric_resistance.h index ddadf11e..9f063a66 100644 --- a/include/SI/electric_resistance.h +++ b/include/SI/electric_resistance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/energy.h b/include/SI/energy.h index 13bd1669..e5f82d60 100644 --- a/include/SI/energy.h +++ b/include/SI/energy.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/equivalent_dose.h b/include/SI/equivalent_dose.h index b2bc50cb..40d29846 100644 --- a/include/SI/equivalent_dose.h +++ b/include/SI/equivalent_dose.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/force.h b/include/SI/force.h index 4e7a7278..7e7a9b63 100644 --- a/include/SI/force.h +++ b/include/SI/force.h @@ -1,6 +1,6 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/frequency.h b/include/SI/frequency.h index b67f0fb5..e07fd50f 100644 --- a/include/SI/frequency.h +++ b/include/SI/frequency.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/illuminance.h b/include/SI/illuminance.h index 14892cfb..5f0965df 100644 --- a/include/SI/illuminance.h +++ b/include/SI/illuminance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/inductance.h b/include/SI/inductance.h index 9e6d8f32..dfe3361e 100644 --- a/include/SI/inductance.h +++ b/include/SI/inductance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/length.h b/include/SI/length.h index 0d8f20c4..20746c5b 100644 --- a/include/SI/length.h +++ b/include/SI/length.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/luminosity.h b/include/SI/luminosity.h index 34dd84b2..c97feb4f 100644 --- a/include/SI/luminosity.h +++ b/include/SI/luminosity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/luminous_flux.h b/include/SI/luminous_flux.h index b9b10cc9..3a5860f3 100644 --- a/include/SI/luminous_flux.h +++ b/include/SI/luminous_flux.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/magnetic_field.h b/include/SI/magnetic_field.h index dad674e6..0bd127ee 100644 --- a/include/SI/magnetic_field.h +++ b/include/SI/magnetic_field.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/magnetic_flux.h b/include/SI/magnetic_flux.h index 18dc01a5..5e47e389 100644 --- a/include/SI/magnetic_flux.h +++ b/include/SI/magnetic_flux.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/mass.h b/include/SI/mass.h index 4a2375fe..a924966d 100644 --- a/include/SI/mass.h +++ b/include/SI/mass.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/momentum.h b/include/SI/momentum.h index ad74a258..4abac541 100644 --- a/include/SI/momentum.h +++ b/include/SI/momentum.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/power.h b/include/SI/power.h index 5799b7cf..5baefc54 100644 --- a/include/SI/power.h +++ b/include/SI/power.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/pressure.h b/include/SI/pressure.h index 2b3ca67d..dae7bb4c 100644 --- a/include/SI/pressure.h +++ b/include/SI/pressure.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/radioactivity.h b/include/SI/radioactivity.h index 74476353..ffda70a4 100644 --- a/include/SI/radioactivity.h +++ b/include/SI/radioactivity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/solid_angle.h b/include/SI/solid_angle.h index ca6e2c8b..887731fb 100644 --- a/include/SI/solid_angle.h +++ b/include/SI/solid_angle.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/stream.h b/include/SI/stream.h index 639d4cba..2d127381 100644 --- a/include/SI/stream.h +++ b/include/SI/stream.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/substance.h b/include/SI/substance.h index 5c8491a3..5b09b704 100644 --- a/include/SI/substance.h +++ b/include/SI/substance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/temperature.h b/include/SI/temperature.h index 3e6914e4..778fa55b 100644 --- a/include/SI/temperature.h +++ b/include/SI/temperature.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/time.h b/include/SI/time.h index 0350f1f2..68663715 100644 --- a/include/SI/time.h +++ b/include/SI/time.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units diff --git a/include/SI/velocity.h b/include/SI/velocity.h index 54673499..9920b73a 100644 --- a/include/SI/velocity.h +++ b/include/SI/velocity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.1.1 + * This file is part of "SI" version 2.1.2 * A header only c++ library that provides type safety and user defined literals * for handling pyhsical values defined in the International System of * Units From bfae4df259a9e6cf8d6890b95fc715942d5cecb2 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Fri, 23 Apr 2021 21:33:42 +0200 Subject: [PATCH 2/5] Update catch2 to version 2.13.6 --- CONTRIBUTING.md | 2 +- conanfile.py | 2 +- test/conanfile.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 14556732..4e1b71e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ Contributions and suggestions to this repo are highly welcome. For deeper techni ## Building the tests -The tests use [Catch2](https://github.com/catchorg/Catch2) version 2.11. Catch is retrieved as a conan package. **If conan is not found, the tests will not be built**. +The tests use [Catch2](https://github.com/catchorg/Catch2) version 2.16. Catch is retrieved as a conan package if possible, else any system install will be used. **If catch2 is not found, the tests will not be built**. For ubuntu releases < 18.04 use: diff --git a/conanfile.py b/conanfile.py index 22f86a7e..d04af9d0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -16,7 +16,7 @@ class SiConan(ConanFile): exports_sources = "include/*", "CMakeLists.txt", "test/*", "doc/CMakeLists.txt", "doc/*.md", "cmake/SIConfig.cmake.in", "LICENSE" no_copy_source = True generators = "cmake", "txt", "cmake_find_package" - build_requires = "Catch2/2.11.1@catchorg/stable" + build_requires = "catch2/2.13.6" _cmake = None def _configure_cmake(self): diff --git a/test/conanfile.txt b/test/conanfile.txt index 7208b41c..9cd08a1c 100644 --- a/test/conanfile.txt +++ b/test/conanfile.txt @@ -1,5 +1,5 @@ [requires] -Catch2/2.11.1@catchorg/stable +catch2/2.13.6 [generators] cmake_find_package From 6a30af786635584b27eccc8990a50f74df51fe59 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Fri, 23 Apr 2021 21:49:33 +0200 Subject: [PATCH 3/5] Shorten benchmark names --- .../benchmarks/string_operations_benchmarks.cc | 4 ++-- .../src/benchmarks/unit_assignment_benchmarks.cc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/src/benchmarks/string_operations_benchmarks.cc b/test/src/benchmarks/string_operations_benchmarks.cc index 06187bd3..e3654312 100644 --- a/test/src/benchmarks/string_operations_benchmarks.cc +++ b/test/src/benchmarks/string_operations_benchmarks.cc @@ -21,7 +21,7 @@ struct unit_symbol<'X', _ratio> TEST_CASE("String operations") { SECTION("unit to string conversion") { - BENCHMARK_ADVANCED("conversion by streams without construction") + BENCHMARK_ADVANCED("conversion by streams") (Catch::Benchmark::Chronometer meter) { constexpr SI::detail::unit_t<'X', std::ratio<1>, int64_t, std::ratio<1>> @@ -34,7 +34,7 @@ TEST_CASE("String operations") { }); }; - BENCHMARK_ADVANCED("conversion by streams including construction") + BENCHMARK_ADVANCED("stream conversion with ctor") (Catch::Benchmark::Chronometer meter) { constexpr SI::detail::unit_t<'X', std::ratio<1>, int64_t, std::ratio<1>> diff --git a/test/src/benchmarks/unit_assignment_benchmarks.cc b/test/src/benchmarks/unit_assignment_benchmarks.cc index 4ac6d207..128f938a 100644 --- a/test/src/benchmarks/unit_assignment_benchmarks.cc +++ b/test/src/benchmarks/unit_assignment_benchmarks.cc @@ -59,7 +59,7 @@ TEST_CASE("Unit_assignment") { return target; }); }; - BENCHMARK_ADVANCED("Same unit same ratio assignment") + BENCHMARK_ADVANCED("same ratio assignment") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); @@ -74,7 +74,7 @@ TEST_CASE("Unit_assignment") { return target; }); }; - BENCHMARK_ADVANCED("Same unit different ratio assignment") + BENCHMARK_ADVANCED("different ratio assignment") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); @@ -92,7 +92,7 @@ TEST_CASE("Unit_assignment") { } SECTION("Add-Assignment") { - BENCHMARK_ADVANCED("Raw number add assignment (reference)") + BENCHMARK_ADVANCED("Raw add assignment (reference)") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); @@ -107,7 +107,7 @@ TEST_CASE("Unit_assignment") { return target; }); }; - BENCHMARK_ADVANCED("Same unit same ratio add assignment") + BENCHMARK_ADVANCED("same ratio add assignment") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); @@ -122,7 +122,7 @@ TEST_CASE("Unit_assignment") { return target; }); }; - BENCHMARK_ADVANCED("Same unit different ratio add assignment") + BENCHMARK_ADVANCED("different ratio add assignment") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); @@ -140,7 +140,7 @@ TEST_CASE("Unit_assignment") { } SECTION("Subtract-Assignment") { - BENCHMARK_ADVANCED("Raw number subtract assignment (reference)") + BENCHMARK_ADVANCED("Raw subtract assignment (reference)") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); @@ -155,7 +155,7 @@ TEST_CASE("Unit_assignment") { return target; }); }; - BENCHMARK_ADVANCED("Same unit same ratio subtract assignment") + BENCHMARK_ADVANCED("same ratio subtract assignment") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); @@ -170,7 +170,7 @@ TEST_CASE("Unit_assignment") { return target; }); }; - BENCHMARK_ADVANCED("Same unit different ratio subtract assignment") + BENCHMARK_ADVANCED("different ratio subtract assignment") (Catch::Benchmark::Chronometer meter) { std::vector source(10000); std::vector target(10000, 0); From 547ba61646043b2f7f20b952eaa22322f8b492f0 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Sat, 24 Apr 2021 09:53:33 +0200 Subject: [PATCH 4/5] Detect and configure conan profile explicitely --- .github/workflows/ci.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c440bc37..33bbee68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,11 +19,15 @@ jobs: include: - name: ubuntu-gcc-7 os: ubuntu-18.04 - compiler: g++-7 + compiler: g++ + compiler-version: 7 + compiler-name-conan: gcc - name: ubuntu-clang-6 os: ubuntu-18.04 - compiler: clang++-6.0 + compiler: clang++ + compiler-version: "6.0" + compiler-name-conan: clang - name: macos-appleclang-11 os: macos-latest @@ -37,7 +41,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt install shunit2 ninja-build python3-setuptools python3-pip -y - if [ "${{ matrix.compiler }}" = "clang++-6.0" ]; then + if [ "${{ matrix.compiler }}" = "clang++" ]; then sudo apt install clang-6.0 -y fi sudo pip3 install conan @@ -52,10 +56,24 @@ jobs: - name: set-compiler-env run: | if [ "${{ matrix.compiler }}" != "" ]; then - echo "CXX=${{ matrix.compiler }}" >> $GITHUB_ENV + echo "CXX=${{ matrix.compiler }}-${{ matrix.compiler-version }}" >> $GITHUB_ENV fi shell: bash + - name: conan-profile + if: runner.os == 'Linux' || runner.os == 'macOs' + run: | + conan profile new default --detect + if [ "${{ matrix.compiler-name-conan }}" != "" ]; then + conan profile update settings.compiler=${{ matrix.compiler-name-conan }} default + fi + if [ "${{ matrix.compiler-version }}" != "" ]; then + conan profile update settings.compiler.version=${{ matrix.compiler-version }} default + fi + conan profile update settings.compiler.libcxx=libstdc++ default + + cat ~/.conan/profiles/default + - name: make-build-dir run: mkdir build - name: cmake-configure-debug From e9a3c5433155af1ac3c11672a2a36542d97515ca Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Wed, 28 Apr 2021 09:55:12 +0200 Subject: [PATCH 5/5] Remove block to deploy to bintray Bintray is scheduled to sunset on May 1 2021 Sad, to see it go! --- .github/workflows/ci.yml | 31 ------------------------------- .lgtm.yml | 2 +- CHANGELOG.md | 1 + README.md | 3 +-- conanfile.py | 11 ++++++----- doc/installation-guide.md | 16 +--------------- 6 files changed, 10 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33bbee68..725ac9bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,34 +114,3 @@ jobs: run: | git fetch --tags --force ./test/version-consistency.sh - - deploy-to-bintray: - needs: version-consistency-check - runs-on: ubuntu-18.04 - - steps: - - uses: actions/checkout@v2 - - - name: dependencies - run: | - sudo apt install shunit2 python3-setuptools python3-pip -y - sudo pip3 install conan - - - name: set-environment - run: | - echo "CONAN_LOGIN_USERNAME=${{ secrets.CONAN_USERNAME }}" >> $GITHUB_ENV - echo "CONAN_PASSWORD=${{ secrets.CONAN_PASSWORD }}" >> $GITHUB_ENV - - - name: deploy-unstable - if: github.event.action != 'published' && github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - run: | - conan remote add bernedom https://api.bintray.com/conan/bernedom/conan - conan create . SI/unstable - conan upload SI/*@SI/unstable --all -c -r bernedom - - - name: deploy-stable - if: github.event.action == 'published' - run: | - conan remote add bernedom https://api.bintray.com/conan/bernedom/conan - conan create . SI/stable - conan upload SI/*@SI/stable --all -c -r bernedom diff --git a/.lgtm.yml b/.lgtm.yml index f396a8c9..12242e73 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -10,4 +10,4 @@ extraction: - export PATH=$PATH:~/.local/bin - conan --version - conan profile new default --detect - - conan remote update conan-center https://conan.bintray.com False + - conan remote update conan-center https://conan.io/center False diff --git a/CHANGELOG.md b/CHANGELOG.md index fc719842..351a56e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 2.1.2 * Update to catch 2.13.6 in the conan recipes +* Remove deployment to bintray.com as it is scheduled to sunset on May 1 2021 ## 2.1.1 diff --git a/README.md b/README.md index bcc22d32..24725ec0 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ [![GitHub Releases](https://img.shields.io/github/release/bernedom/SI.svg)](https://github.com/bernedom/SI/releases) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/bernedom/SI/master/LICENSE) -[![Download](https://api.bintray.com/packages/bernedom/conan/si%3ASI/images/download.svg)](https://bintray.com/bernedom/conan/si%3ASI/_latestVersion) # SI - Type safety for physical units @@ -129,7 +128,7 @@ substitute `--config Debug` with `--config Release` for optimized builds ### Installing -The default installation location for SI is `/usr/local/lib/SI`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [Bintray](https://bintray.com/bernedom/conan/si%3ASI) +The default installation location for SI is `/usr/local/lib/SI`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [conan center](https://conan.io/center/si/) See [the installation guide](doc/installation-guide.md) for detailed instructions diff --git a/conanfile.py b/conanfile.py index d04af9d0..0e2b15b8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,13 +1,14 @@ from conans import ConanFile, CMake from conans.tools import load -import re, os +import re +import os class SiConan(ConanFile): name = "si" license = "MIT" - url = "https://bintray.com/beta/#/bernedom/conan/si:si" + url = "https://conan.io/center/si/" homepage = "https://github.com/bernedom/SI" description = "A header only c++ library that provides type safety and user defined literals \ for handling pyhsical values defined in the International System of Units." @@ -28,10 +29,10 @@ def _configure_cmake(self): def set_version(self): cmake = load(os.path.join(self.recipe_folder, "CMakeLists.txt")) - - version = re.search(r"(?:[ \t]*)(?:VERSION\s+?)(\d+\.\d+\.\d+)", cmake).group(1) - self.version = version + version = re.search( + r"(?:[ \t]*)(?:VERSION\s+?)(\d+\.\d+\.\d+)", cmake).group(1) + self.version = version def build(self): cmake = self._configure_cmake() diff --git a/doc/installation-guide.md b/doc/installation-guide.md index 7232f516..02ce374c 100644 --- a/doc/installation-guide.md +++ b/doc/installation-guide.md @@ -1,6 +1,6 @@ # Installing `SI` -The default installation location for SI is `/usr/local/lib/si`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [conan center](https://conan.io/center/si). Early access to conan packages for unstable versions is available from [Bintray](https://bintray.com/bernedom/conan/si%3ASI) +The default installation location for SI is `/usr/local/lib/si`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [conan center](https://conan.io/center/si). ## Installing using cmake @@ -48,20 +48,6 @@ Use the following in your `conanfile.txt` si/[>1.0 <2.0]@SI/stable ``` -### Early access and nightly builds - -For nightly builds and early access to versions use the custom repository https://api.bintray.com/conan/bernedom/conan - -```bash -conan remote add bernedom https://api.bintray.com/conan/bernedom/conan -``` -In the `conanfile.txt` SI is added like this, to ensure to get the latest version. - -``` -[requires] -si/[>1.0 <2.0]@SI/stable -``` - `SI/stable` are release builds and are considered usable. Use `SI/unstable` to get the latest development builds. See the [official conan documentation](https://docs.conan.io/en/latest/integrations/build_system/cmake/cmake_generator.html) on how to integrate the package into your cmake project.