Revert "fix sid build with sip 6.9.1"

This reverts commit 8825f86.
qgis · Dec 24, 2024 · 241a21c · 241a21c
1 parent 643ac67
commit 241a21c
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 14 deletions.
diff --git a/python/3d/pyproject.toml.in b/python/3d/pyproject.toml.in
@@ -2,7 +2,6 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
-@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -178,15 +178,6 @@ if(NOT WITH_QTWEBENGINE)
   set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_WEBENGINE_SIP)
 endif()
 
-# Deprecated annotation supports message only since version 6.9.0 with abi-version 12.16 / 13.9 and above
-if(${SIP_VERSION_STR} VERSION_LESS 6.9.0)
-  set(sipabi "")
-elseif(BUILD_WITH_QT6)
-  set(sipabi "\n[tool.sip.project]\nabi-version = \"13.9\"")
-else()
-  set(sipabi "\n[tool.sip.project]\nabi-version = \"12.16\"")
-endif()
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/core/project.py @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core/pyproject.toml.in ${CMAKE_CURRENT_BINARY_DIR}/core/pyproject.toml @ONLY)
 GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp_files)

diff --git a/python/analysis/pyproject.toml.in b/python/analysis/pyproject.toml.in
@@ -2,7 +2,6 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
-@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/core/pyproject.toml.in b/python/core/pyproject.toml.in
@@ -2,7 +2,6 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
-@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/gui/pyproject.toml.in b/python/gui/pyproject.toml.in
@@ -2,7 +2,6 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
-@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/server/pyproject.toml.in b/python/server/pyproject.toml.in
@@ -2,7 +2,6 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
-@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]