From 2340dab38372f034d4b2585432361d08484ae80d Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 1 Aug 2022 10:01:33 -0400 Subject: [PATCH 01/17] fix: support pybind11 2.10 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c151c16..18eb1a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=42", - "pybind11~=2.9.2", + "pybind11>=2.10.0", "cmake>=3.22", "scikit-build>=0.15.0", ] From ebb586fbaf610d47687468a2e76281ec99f65dae Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 16 Sep 2022 11:25:44 -0400 Subject: [PATCH 02/17] debug: increase build verbosity --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 18eb1a1..5c3710e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,3 +14,4 @@ profile = "black" test-command = "pytest {project}/tests" test-extras = ["test"] test-skip = ["*universal2:arm64"] +build-verbosity = 1 From fe51001c02f62b0ec2fe0c5d33f4829822881680 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 16 Sep 2022 11:33:49 -0400 Subject: [PATCH 03/17] Update CMakeLists.txt --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17efbaf..3451728 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ if(SKBUILD) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") endif() +set(PythonLibsNew_FIND_VERSION " ") + # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED) From 42987b932047dfa3d6a351aa2fb93f1e0a8ac826 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 21 Sep 2022 15:56:26 -0400 Subject: [PATCH 04/17] WIP: try classic pybind11 + min Python version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5c3710e..bbd7d07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=42", - "pybind11>=2.10.0", + "pybind11~=2.9.2", "cmake>=3.22", "scikit-build>=0.15.0", ] From da1cf2f283abdb9662419b7b02ba8adae9e7eb42 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 21 Sep 2022 15:58:18 -0400 Subject: [PATCH 05/17] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3451728..646a8bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if(SKBUILD) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") endif() -set(PythonLibsNew_FIND_VERSION " ") +set(PythonLibsNew_FIND_VERSION "3.6") # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED) From 453cdba04fb7b6e0645a45badf6899396f2a5706 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 22 Sep 2022 00:14:37 -0400 Subject: [PATCH 06/17] WIP: back to 2.10 --- CMakeLists.txt | 2 -- pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 646a8bd..17efbaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,6 @@ if(SKBUILD) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") endif() -set(PythonLibsNew_FIND_VERSION "3.6") - # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED) diff --git a/pyproject.toml b/pyproject.toml index bbd7d07..5c3710e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=42", - "pybind11~=2.9.2", + "pybind11>=2.10.0", "cmake>=3.22", "scikit-build>=0.15.0", ] From a53067357f4b7da3005915873a6f873dcdc77b47 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 22 Sep 2022 00:29:54 -0400 Subject: [PATCH 07/17] WIP: debug printout --- CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17efbaf..ed99ef5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,22 @@ if(SKBUILD) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") endif() + +find_package(PythonInterp 3.6 REQUIRED) +include(CMakePrintHelpers) +cmake_print_variables( +_PYTHON_VERSION_LIST +PYTHON_PREFIX +PYTHON_INCLUDE_DIR +PYTHON_SITE_PACKAGES +PYTHON_MODULE_EXTENSION +PYTHON_IS_DEBUG +PYTHON_SIZEOF_VOID_P +PYTHON_LIBRARY_SUFFIX +PYTHON_LIBDIR +PYTHON_MULTIARCH +) + # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED) From 5688a60dcb2c2f2800be68a51011bea3b065f8cf Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 22 Sep 2022 01:40:03 -0400 Subject: [PATCH 08/17] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5c3710e..a317a62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=42", - "pybind11>=2.10.0", + "pybind11 @ git+https://github.com/pybind/pybind11@henryiii/fix/pypy", "cmake>=3.22", "scikit-build>=0.15.0", ] From 46f0276e6ec84d4f1cb3be4656836b6ff5e735f5 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 22 Sep 2022 01:40:37 -0400 Subject: [PATCH 09/17] Update CMakeLists.txt --- CMakeLists.txt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed99ef5..17efbaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,22 +14,6 @@ if(SKBUILD) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") endif() - -find_package(PythonInterp 3.6 REQUIRED) -include(CMakePrintHelpers) -cmake_print_variables( -_PYTHON_VERSION_LIST -PYTHON_PREFIX -PYTHON_INCLUDE_DIR -PYTHON_SITE_PACKAGES -PYTHON_MODULE_EXTENSION -PYTHON_IS_DEBUG -PYTHON_SIZEOF_VOID_P -PYTHON_LIBRARY_SUFFIX -PYTHON_LIBDIR -PYTHON_MULTIARCH -) - # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED) From 89a0021ab8abcd4bedf3285e6a9bbc9d04b09a95 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 22 Sep 2022 08:58:03 -0400 Subject: [PATCH 10/17] WIP: more printing --- CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17efbaf..a2ddb68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,48 @@ if(SKBUILD) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") endif() + +include(CMakePrintHelpers) +cmake_print_variables( +_PYTHON_VERSION_LIST +PYTHON_PREFIX +PYTHON_INCLUDE_DIR +PYTHON_SITE_PACKAGES +PYTHON_MODULE_EXTENSION +PYTHON_IS_DEBUG +PYTHON_SIZEOF_VOID_P +PYTHON_LIBRARY_SUFFIX +PYTHON_LIBDIR +PYTHON_MULTIARCH +) +find_package(PythonInterp 3.6 REQUIRED) +cmake_print_variables( +_PYTHON_VERSION_LIST +PYTHON_PREFIX +PYTHON_INCLUDE_DIR +PYTHON_SITE_PACKAGES +PYTHON_MODULE_EXTENSION +PYTHON_IS_DEBUG +PYTHON_SIZEOF_VOID_P +PYTHON_LIBRARY_SUFFIX +PYTHON_LIBDIR +PYTHON_MULTIARCH +) + # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED) +cmake_print_variables( +_PYTHON_VERSION_LIST +PYTHON_PREFIX +PYTHON_INCLUDE_DIR +PYTHON_SITE_PACKAGES +PYTHON_MODULE_EXTENSION +PYTHON_IS_DEBUG +PYTHON_SIZEOF_VOID_P +PYTHON_LIBRARY_SUFFIX +PYTHON_LIBDIR +PYTHON_MULTIARCH +) pybind11_add_module(_core MODULE src/main.cpp) From 5f1cd0c1d6726e8369c297ac9d4f0d9ab06dd817 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 10 Oct 2022 14:59:38 -0400 Subject: [PATCH 11/17] fix: clear the cache when rebuilding Signed-off-by: Henry Schreiner --- CMakeLists.txt | 37 ------------------------------------- pyproject.toml | 5 ++++- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2ddb68..0b8e5a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,47 +15,10 @@ if(SKBUILD) endif() -include(CMakePrintHelpers) -cmake_print_variables( -_PYTHON_VERSION_LIST -PYTHON_PREFIX -PYTHON_INCLUDE_DIR -PYTHON_SITE_PACKAGES -PYTHON_MODULE_EXTENSION -PYTHON_IS_DEBUG -PYTHON_SIZEOF_VOID_P -PYTHON_LIBRARY_SUFFIX -PYTHON_LIBDIR -PYTHON_MULTIARCH -) find_package(PythonInterp 3.6 REQUIRED) -cmake_print_variables( -_PYTHON_VERSION_LIST -PYTHON_PREFIX -PYTHON_INCLUDE_DIR -PYTHON_SITE_PACKAGES -PYTHON_MODULE_EXTENSION -PYTHON_IS_DEBUG -PYTHON_SIZEOF_VOID_P -PYTHON_LIBRARY_SUFFIX -PYTHON_LIBDIR -PYTHON_MULTIARCH -) # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED) -cmake_print_variables( -_PYTHON_VERSION_LIST -PYTHON_PREFIX -PYTHON_INCLUDE_DIR -PYTHON_SITE_PACKAGES -PYTHON_MODULE_EXTENSION -PYTHON_IS_DEBUG -PYTHON_SIZEOF_VOID_P -PYTHON_LIBRARY_SUFFIX -PYTHON_LIBDIR -PYTHON_MULTIARCH -) pybind11_add_module(_core MODULE src/main.cpp) diff --git a/pyproject.toml b/pyproject.toml index a317a62..c187117 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=42", - "pybind11 @ git+https://github.com/pybind/pybind11@henryiii/fix/pypy", + "pybind11>=3.10", "cmake>=3.22", "scikit-build>=0.15.0", ] @@ -15,3 +15,6 @@ test-command = "pytest {project}/tests" test-extras = ["test"] test-skip = ["*universal2:arm64"] build-verbosity = 1 +before-build = [ + "rm -r _skbuild", +] From 83f0856a54e0337bdb11a9e27083ce40ad752dbb Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 10 Oct 2022 15:01:41 -0400 Subject: [PATCH 12/17] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c187117..1671f2b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=42", - "pybind11>=3.10", + "pybind11>=2.10", "cmake>=3.22", "scikit-build>=0.15.0", ] From d5c527dff9135a99749acc45454f31b299acf55b Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 10 Oct 2022 16:13:39 -0400 Subject: [PATCH 13/17] Update pyproject.toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1671f2b..9ac4fcf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,6 +15,6 @@ test-command = "pytest {project}/tests" test-extras = ["test"] test-skip = ["*universal2:arm64"] build-verbosity = 1 -before-build = [ - "rm -r _skbuild", +linux.before-build = [ + "rm -r _skbuild || echo "No previous run to clean", ] From 5b00cac73fd24568525fae2848d869febac8d988 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 10 Oct 2022 23:53:37 -0400 Subject: [PATCH 14/17] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9ac4fcf..88dd402 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,5 +16,5 @@ test-extras = ["test"] test-skip = ["*universal2:arm64"] build-verbosity = 1 linux.before-build = [ - "rm -r _skbuild || echo "No previous run to clean", + "rm -r _skbuild || echo 'No previous run to clean', ] From 76b46060e1068c75a86463a5969d594a2fdda82f Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 11 Oct 2022 00:47:11 -0400 Subject: [PATCH 15/17] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 88dd402..cde4403 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,5 +16,5 @@ test-extras = ["test"] test-skip = ["*universal2:arm64"] build-verbosity = 1 linux.before-build = [ - "rm -r _skbuild || echo 'No previous run to clean', + "rm -r _skbuild || echo 'No previous run to clean'", ] From 253dea4e12d4a3c7ae847d1e5385685f0181285e Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 19 Oct 2022 22:41:02 -0400 Subject: [PATCH 16/17] fix: try new PR Signed-off-by: Henry Schreiner --- pyproject.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cde4403..a317a62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=42", - "pybind11>=2.10", + "pybind11 @ git+https://github.com/pybind/pybind11@henryiii/fix/pypy", "cmake>=3.22", "scikit-build>=0.15.0", ] @@ -15,6 +15,3 @@ test-command = "pytest {project}/tests" test-extras = ["test"] test-skip = ["*universal2:arm64"] build-verbosity = 1 -linux.before-build = [ - "rm -r _skbuild || echo 'No previous run to clean'", -] From ea1954a41b14570e2c7b50991ce07b666ab6b86a Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 19 Oct 2022 23:41:00 -0400 Subject: [PATCH 17/17] fix: drop unneeded line & rebuild --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b8e5a9..17efbaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,6 @@ if(SKBUILD) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") endif() - -find_package(PythonInterp 3.6 REQUIRED) - # Now we can find pybind11 find_package(pybind11 CONFIG REQUIRED)