Merge pull request #187 from saraedum/fmt10

Support building against fmt=10

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
 skip = libintervalxt/src/external/**/*,libintervalxt/test/external/**/*
-ignore-words-list = rever
+ignore-words-list = rever,parma

doc/news/fmt10.rst

@@ -0,0 +1,3 @@
+**Fixed:**
+
+* Fixed building libintervalxt with fmt version 10.

libintervalxt/configure.ac

@@ -46,7 +46,9 @@ AC_CHECK_HEADERS([fmt/format.h], , AC_MSG_ERROR([fmt headers not found]))
 AX_CXX_CHECK_LIB([fmt], [fmt::v6::getpagesize()], , [
   AX_CXX_CHECK_LIB([fmt], [fmt::v7::getpagesize()], , [
     AX_CXX_CHECK_LIB([fmt], [fmt::v8::report_system_error(int code=0, const char* message=nullptr)], , [
-      AX_CXX_CHECK_LIB([fmt], [fmt::v9::report_system_error(int code=0, const char* message=nullptr)], , [AC_MSG_ERROR([fmt library not found])], [-lfmt])
+      AX_CXX_CHECK_LIB([fmt], [fmt::v9::report_system_error(int code=0, const char* message=nullptr)], , [
+        AX_CXX_CHECK_LIB([fmt], [fmt::v10::report_system_error(int code=0, const char* message=nullptr)], , [AC_MSG_ERROR([fmt library not found])], [-lfmt])
+      ], [-lfmt])
     ], [-lfmt])
   ], [-lfmt])
 ], [-lfmt])

libintervalxt/environment.yml

@@ -13,7 +13,7 @@ dependencies:
   - cxx-compiler
   - libeantic>=1,<2
   - libflint
-  - fmt=9
+  - fmt=10
   - gmp
   - gmpxxll
   - libexactreal>=3,<4

libintervalxt/recipe/conda_build_config.yaml

@@ -5,4 +5,4 @@ boost_cpp:
 gmp:
   - '6'
 fmt:
-  - '9'
+  - '10'

libintervalxt/test/interval_exchange_transformation.test.cc

@@ -326,7 +326,7 @@ TEST_CASE("Computation of SAF Invariant", "[interval_exchange_transformation][sa
       auto iet = IET(lengths, {a, b, c, d}, {d, c, b, a});
       CAPTURE(iet);
 
-      // Check that SAF invariant can be computed in an initiallly swapped IET.
+      // Check that SAF invariant can be computed in an initially swapped IET.
       iet.swap();
       iet.safInvariant();
       iet.swap();

pyintervalxt/src/pyintervalxt/cppyy_intervalxt.py

@@ -57,12 +57,12 @@ def track(self, name, headers):
     def __call__(self):
         for length, headers in self.known_lengths:
             if length not in LengthRegistrar.REGISTERED_LENGTHS:
-                if length == "intervalxt::cppyy::Lengths<std::vector<__gmp_expr<__mpz_struct[1],__mpz_struct[1]> > >":
+                if length.replace(' ', '') == "intervalxt::cppyy::Lengths<std::vector<__gmp_expr<__mpz_struct[1],__mpz_struct[1]>>>":
                     import logging
                     logging.warning("GMP does not provide a cereal interface yet. Therefore serialization of mpz lengths is not supported yet.")
                     continue
 
-                if length == "intervalxt::cppyy::Lengths<std::vector<__gmp_expr<__mpq_struct[1],__mpq_struct[1]> > >":
+                if length.replace(' ', '') == "intervalxt::cppyy::Lengths<std::vector<__gmp_expr<__mpq_struct[1],__mpq_struct[1]>>>":
                     import logging
                     logging.warning("GMP does not provide a cereal interface yet. Therefore serialization of mpq lengths is not supported yet.")
                     continue