From edac633a5507b5ba6aa1d77978c3efd375a0b3f6 Mon Sep 17 00:00:00 2001 From: maelic Date: Mon, 14 Mar 2022 11:24:35 +0100 Subject: [PATCH 01/10] change boost to 1.71 --- cmake/set_dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake index dab180e..7e1fdde 100644 --- a/cmake/set_dependencies.cmake +++ b/cmake/set_dependencies.cmake @@ -45,7 +45,7 @@ include_guard(GLOBAL) # Version of Boost to use. It will be used as the argument to the `find_package(Boost)` call. -overridable_variable(BOOST_VERSION 1.64) +overridable_variable(BOOST_VERSION 1.71) # Version of pybind11 to use. overridable_variable(PYBIND11_VERSION 2.5.0) From 03b1aec8d79ac225bc862bf6e6211b3bde5afbff Mon Sep 17 00:00:00 2001 From: maelic Date: Mon, 14 Mar 2022 15:00:20 +0100 Subject: [PATCH 02/10] force using python3.8 --- cmake/set_dependencies.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake index 7e1fdde..b62348f 100644 --- a/cmake/set_dependencies.cmake +++ b/cmake/set_dependencies.cmake @@ -69,10 +69,8 @@ overridable_variable(GOOGLETEST_GIT_REPOSITORY https://github.com/google/googlet # `ExternalProject` module documentation of the `GIT_TAG` argument. overridable_variable(GOOGLETEST_GIT_TAG release-${GOOGLETEST_VERSION}) -set(PYTHON_VERSION_STRING "" CACHE STRING "Version of Python to look for. This \ -variable can be specified by tools run directly from Python to enforce the \ -use of the same version.") -mark_as_advanced(PYTHON_VERSION_STRING) + +overridable_variable(PYTHON_VERSION_STRING 3.8) if(NOT COMMAND FetchContent_Declare) include(FetchContent) From f020522df894e993fca4c035b88a2b7e189cc7e9 Mon Sep 17 00:00:00 2001 From: maelic Date: Mon, 14 Mar 2022 15:03:14 +0100 Subject: [PATCH 03/10] force using python3.8 --- cmake/set_dependencies.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake index b62348f..1b94ead 100644 --- a/cmake/set_dependencies.cmake +++ b/cmake/set_dependencies.cmake @@ -174,11 +174,8 @@ find_package(OpenSSL REQUIRED) # Python parse_python_version(_python_version "${PYTHON_VERSION_STRING}") -if(_python_version_VERSION_STRING) - set(_python_version ${_python_version_VERSION_RELEASE_MAJOR_MINOR}) -else() - set(_python_version 3.5) # default to Python 3.5+. -endif() +set(_python_version 3.8) + # Set variables that the CMake module recognizes from variables that the # scikit-build build system module may pass to us. From a416d67bf59ca4cdb04a89163fabab595520ef8b Mon Sep 17 00:00:00 2001 From: maelic Date: Mon, 14 Mar 2022 15:05:18 +0100 Subject: [PATCH 04/10] force using python3.8 --- cmake/set_dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake index 1b94ead..ca80db6 100644 --- a/cmake/set_dependencies.cmake +++ b/cmake/set_dependencies.cmake @@ -70,7 +70,7 @@ overridable_variable(GOOGLETEST_GIT_REPOSITORY https://github.com/google/googlet overridable_variable(GOOGLETEST_GIT_TAG release-${GOOGLETEST_VERSION}) -overridable_variable(PYTHON_VERSION_STRING 3.8) +overridable_variable(PYTHON_VERSION 3.8) if(NOT COMMAND FetchContent_Declare) include(FetchContent) From 626b329fe8246519c1a911e742c6cba09dc6e7bb Mon Sep 17 00:00:00 2001 From: maelic Date: Mon, 14 Mar 2022 15:08:39 +0100 Subject: [PATCH 05/10] force using python3.8 --- cmake/set_libqi_dependency_system.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/set_libqi_dependency_system.cmake b/cmake/set_libqi_dependency_system.cmake index 46d2168..478da86 100644 --- a/cmake/set_libqi_dependency_system.cmake +++ b/cmake/set_libqi_dependency_system.cmake @@ -35,7 +35,7 @@ target_link_libraries(qi.interface INTERFACE ${QI_LIBRARIES}) foreach(_dep IN LISTS QI_DEPENDS) if(NOT ${_dep}_PACKAGE_FOUND) - find_package(${_dep} REQUIRED CONFIG) + find_package(${_dep} EXACT REQUIRED CONFIG) endif() target_include_directories(qi.interface SYSTEM INTERFACE ${${_dep}_INCLUDE_DIRS}) target_link_libraries(qi.interface INTERFACE ${${_dep}_LIBRARIES}) From d3219ecf18eb20e41fca573f8dd2d83dddc49428 Mon Sep 17 00:00:00 2001 From: maelic Date: Mon, 14 Mar 2022 15:12:09 +0100 Subject: [PATCH 06/10] force using python3.8 --- cmake/set_dependencies.cmake | 6 ++---- cmake/set_libqi_dependency_system.cmake | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake index ca80db6..9940583 100644 --- a/cmake/set_dependencies.cmake +++ b/cmake/set_dependencies.cmake @@ -192,10 +192,8 @@ endif() # only, but this time force the module to find it or fail (REQUIRED). # Some of our toolchains (when crosscompiling for instance) have the Python # library but not an interpreter that can run on the host. -find_package(Python ${_python_version} COMPONENTS Development Interpreter) -if(NOT Python_FOUND) - find_package(Python ${_python_version} REQUIRED COMPONENTS Development) -endif() +find_package(Python ${_python_version} EXACT COMPONENTS Development Interpreter) + list(GET Python_LIBRARIES 0 _py_lib) add_library(python_headers INTERFACE) diff --git a/cmake/set_libqi_dependency_system.cmake b/cmake/set_libqi_dependency_system.cmake index 478da86..46d2168 100644 --- a/cmake/set_libqi_dependency_system.cmake +++ b/cmake/set_libqi_dependency_system.cmake @@ -35,7 +35,7 @@ target_link_libraries(qi.interface INTERFACE ${QI_LIBRARIES}) foreach(_dep IN LISTS QI_DEPENDS) if(NOT ${_dep}_PACKAGE_FOUND) - find_package(${_dep} EXACT REQUIRED CONFIG) + find_package(${_dep} REQUIRED CONFIG) endif() target_include_directories(qi.interface SYSTEM INTERFACE ${${_dep}_INCLUDE_DIRS}) target_link_libraries(qi.interface INTERFACE ${${_dep}_LIBRARIES}) From d5e250a7ce1b6039bb1f57f750cab51412dfecca Mon Sep 17 00:00:00 2001 From: maelic Date: Mon, 21 Mar 2022 19:32:01 +0100 Subject: [PATCH 07/10] debug test --- src/pytranslator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pytranslator.cpp b/src/pytranslator.cpp index 7843d35..e2e1f6f 100644 --- a/src/pytranslator.cpp +++ b/src/pytranslator.cpp @@ -32,8 +32,8 @@ void exportTranslator(::py::module& m) doc("Translate a message with a context.")) .def("setCurrentLocale", &Translator::setCurrentLocale, call_guard(), "locale"_a, doc("Set the locale.")) - .def("setDefaultDomain", &Translator::setDefaultDomain, "domain"_a, - call_guard(), doc("Set the domain.")) + .def("setDefaultDomain", &Translator::setDefaultDomain, + call_guard(), "domain"_a, doc("Set the domain.")) .def("addDomain", &Translator::addDomain, "domain"_a, doc("Add a new domain.")); } From 30697739bc6349e617f77e2a60d8a346b216ee05 Mon Sep 17 00:00:00 2001 From: maelic Date: Sun, 13 Aug 2023 14:10:07 +0200 Subject: [PATCH 08/10] Force using python 3.10 and boost 1.78 --- cmake/set_dependencies.cmake | 6 +++--- setup.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake index ff270f0..a435548 100644 --- a/cmake/set_dependencies.cmake +++ b/cmake/set_dependencies.cmake @@ -45,7 +45,7 @@ include_guard(GLOBAL) # Version of Boost to use. It will be used as the argument to the `find_package(Boost)` call. -overridable_variable(BOOST_VERSION 1.77) +overridable_variable(BOOST_VERSION 1.78) # Version of pybind11 to use. overridable_variable(PYBIND11_VERSION 2.9.0) @@ -67,7 +67,7 @@ overridable_variable(GOOGLETEST_GIT_REPOSITORY https://github.com/google/googlet overridable_variable(GOOGLETEST_GIT_TAG main) -overridable_variable(PYTHON_VERSION 3.8) +overridable_variable(PYTHON_VERSION 3.10) if(NOT COMMAND FetchContent_Declare) include(FetchContent) @@ -171,7 +171,7 @@ find_package(OpenSSL REQUIRED) # Python parse_python_version(_python_version "${PYTHON_VERSION_STRING}") -set(_python_version 3.8) +set(_python_version 3.10) # Set variables that the CMake module recognizes from variables that the diff --git a/setup.py b/setup.py index 66c1e53..1c2f52f 100755 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3 :: Only', ], cmake_args=['-DQIPYTHON_STANDALONE:BOOL=ON'], From 37c3ec4331384712317a5c604342ead6f245ceb1 Mon Sep 17 00:00:00 2001 From: maelic Date: Sun, 13 Aug 2023 14:26:03 +0200 Subject: [PATCH 09/10] project name in toml file --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index cc4c529..dd07d60 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,5 @@ [project] +name = "qi" dependencies = [ "packaging" ] From 4fe041c47f8bd89ff3e7643a4cb5ad0b4e815ff6 Mon Sep 17 00:00:00 2001 From: maelic Date: Sun, 13 Aug 2023 14:30:39 +0200 Subject: [PATCH 10/10] Add version to toml project file --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index dd07d60..f33184e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,6 @@ [project] name = "qi" +version = "3.1.1" dependencies = [ "packaging" ]