Use scikit-build-core instead of setuptools, supports python 3.12, 3.13, drop python 3.6 (#17)

* update linux

* fix

* fix

* update

* remove

* update headers

* update flake8

* move

* update

* fix

* fix

* fix me

* update github actions

* init pyi

* update

* fix

* fix

* ready

* fix

* fix

* fix

* fix

Author: district10

.github/workflows/format.yml

@@ -15,7 +15,9 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
     - uses: actions/setup-python@v4
       with:
         python-version: "3.x"

.github/workflows/pip.yml

@@ -1,4 +1,4 @@
-name: Pip
+name: "Pip"
 
 on:
   workflow_dispatch:
@@ -9,25 +9,23 @@ on:
 
 jobs:
   build:
+    name: Build with Pip
+    runs-on: ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-20.04, windows-2019, macos-11]
-        python-version: ["3.8", "3.9", "3.10"]
-
-    runs-on: ${{ matrix.platform }}
+        platform: [windows-latest, macos-latest, ubuntu-latest]
+        python-version: ["3.9", "3.12"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-
-    - name: Add requirements
-      run: python -m pip install --upgrade wheel setuptools
+        allow-prereleases: true
 
     - name: Build and install
       run: pip install --verbose .[test]

.github/workflows/wheels.yml

@@ -10,12 +10,19 @@ on:
     types:
       - published
 
+env:
+  FORCE_COLOR: 3
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_sdist:
     name: Build SDist
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
@@ -25,8 +32,9 @@ jobs:
     - name: Check metadata
       run: pipx run twine check dist/*
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: cibw-sdist
         path: dist/*.tar.gz
 
 
@@ -36,37 +44,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
-    - name: Set up QEMU
-      if: runner.os == 'Linux'
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: all
+    - uses: astral-sh/setup-uv@v4
 
-    - uses: pypa/cibuildwheel@v2.12.0
+    - uses: pypa/cibuildwheel@v2.22
       env:
-        # CIBW_ARCHS: auto64
-        CIBW_ARCHS_LINUX: x86_64 aarch64
-        CIBW_ARCHS_WINDOWS: AMD64 # ARM64
-        CIBW_ARCHS_MACOS: x86_64 arm64
-        CIBW_BEFORE_BUILD: pip install numpy --prefer-binary
-        # https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip
-        CIBW_SKIP: pp* *i686 *musllinux*
+        CIBW_ENABLE: cpython-prerelease
+        CIBW_ARCHS_WINDOWS: auto ARM64
+        CIBW_SKIP: pp* *i686
         CIBW_TEST_SKIP: "*macosx* *win* *aarch64"
 
     - name: Verify clean directory
       run: git diff --exit-code
       shell: bash
 
-    - name: Upload wheels
-      uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: cibw-wheels-${{ matrix.os }}
         path: wheelhouse/*.whl
 
 
@@ -75,17 +75,28 @@ jobs:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
+    environment: pypi
+    permissions:
+      id-token: write
+      attestations: write
 
     steps:
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
-        name: artifact
+        pattern: cibw-*
+        merge-multiple: true
         path: dist
 
-    - uses: pypa/gh-action-pypi-publish@v1.6.4
+    - name: Generate artifact attestation for sdist and wheels
+      uses: actions/attest-build-provenance@v1
+      with:
+        subject-path: "dist/*"
+
+    - uses: pypa/gh-action-pypi-publish@release/v1
       with:
+        attestations: true
         password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

@@ -8,3 +8,4 @@ _generate/
 *env*
 wheelhouse
 !test.py
+pybind-jsoncons

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "pybind11"]
-    path = pybind11
-    url = https://github.com/pybind/pybind11.git
-    branch = master
 [submodule "headers"]
     path = headers
     url = https://github.com/cubao/headers.git

.pre-commit-config.yaml

@@ -16,10 +16,16 @@ ci:
   autoupdate_commit_msg: "chore: update pre-commit hooks"
   autofix_commit_msg: "style: pre-commit fixes"
 
+exclude: |
+  (?x)^(
+    src/include/.*
+  )$
+
+
 repos:
 # Standard hooks
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.1.0
+  rev: v5.0.0
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
@@ -56,13 +62,13 @@ repos:
 
 # Changes tabs to spaces
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.1.13
+  rev: v1.5.5
   hooks:
   - id: remove-tabs
     exclude: ^(docs|Makefile)
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 3.9.2
+  rev: 7.2.0
   hooks:
   - id: flake8
     additional_dependencies: [flake8-bugbear]

CMakeLists.txt

@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.4...3.18)
-project(pybind11_rdp)
-
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+# Require CMake 3.15+ (matching scikit-build-core) Use new versions of all
+# policies up to CMake 3.27
+cmake_minimum_required(VERSION 3.15...3.27)
 
+# set(CMAKE_BUILD_TYPE "Debug")
 if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
   set(CMAKE_BUILD_TYPE
       "Release"
@@ -19,16 +18,38 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 endif()
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragma-once-outside-header")
+endif()
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+add_definitions(-DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}")
+add_definitions(-DPROJECT_BINARY_DIR="${PROJECT_BINARY_DIR}")
 
-include_directories(BEFORE ${PROJECT_SOURCE_DIR}/headers/include)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# Scikit-build-core sets these values for you, or you can just hard-code the
+# name and version.
+project(
+  ${SKBUILD_PROJECT_NAME}
+  VERSION ${SKBUILD_PROJECT_VERSION}
+  LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 14)
-set(PYBIND11_CPP_STANDARD -std=c++14)
+# Find the module development requirements (requires FindPython from 3.17 or
+# scikit-build-core's built-in backport)
+find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
+find_package(pybind11 CONFIG REQUIRED)
+include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/headers/include)
+
+# Add a library using FindPython's tooling (pybind11 also provides a helper like
+# this)
+python_add_library(_core MODULE src/main.cpp WITH_SOABI)
+target_link_libraries(_core PRIVATE pybind11::headers)
 
-add_subdirectory(pybind11)
-pybind11_add_module(_pybind11_rdp src/main.cpp)
+# This is passing in the version as a define just as an example
+target_compile_definitions(_core PRIVATE VERSION_INFO=${PROJECT_VERSION})
 
-# EXAMPLE_VERSION_INFO is defined by setup.py and passed into the C++ code as a
-# define (VERSION_INFO) here.
-target_compile_definitions(_pybind11_rdp
-                           PRIVATE VERSION_INFO=${EXAMPLE_VERSION_INFO})
+# The install directory is the output (wheel) directory
+install(TARGETS _core DESTINATION pybind11_rdp)

MANIFEST.in

@@ -1,7 +1,5 @@
-include README.md LICENSE pybind11/LICENSE
+include README.md LICENSE
 graft headers
-graft pybind11/include
-graft pybind11/tools
 graft src
 graft tests
 global-include CMakeLists.txt *.cmake

Makefile

@@ -1,3 +1,7 @@
+PROJECT_SOURCE_DIR ?= $(abspath ./)
+PROJECT_NAME ?= $(shell basename $(PROJECT_SOURCE_DIR))
+NUM_JOBS ?= 8
+
 all:
 	@echo nothing special
 
@@ -11,19 +15,23 @@ lint:
 	pre-commit run -a
 lint_install:
 	pre-commit install
+.PHONY: lint
 
-build:
-	mkdir -p build && cd build && \
-	cmake .. && make
-.PHONY: build
+reset_submodules:
+	git submodule update --init --recursive
+
+pytest:
+	python3 -m pip install pytest
+	pytest tests # --capture=tee-sys
+.PHONY: test pytest
 
 docs_build:
 	mkdocs build
 docs_serve:
 	mkdocs serve -a 0.0.0.0:8088
 
 DOCKER_TAG_WINDOWS ?= ghcr.io/cubao/build-env-windows-x64:v0.0.1
-DOCKER_TAG_LINUX ?= ghcr.io/cubao/build-env-manylinux2014-x64:v0.0.1
+DOCKER_TAG_LINUX ?= ghcr.io/cubao/build-env-manylinux2014-x64:v0.0.4
 DOCKER_TAG_MACOS ?= ghcr.io/cubao/build-env-macos-arm64:v0.0.1
 
 test_in_win:
@@ -33,19 +41,29 @@ test_in_mac:
 test_in_linux:
 	docker run --rm -w `pwd` -v `pwd`:`pwd` -v `pwd`/build/linux:`pwd`/build -it $(DOCKER_TAG_LINUX) bash
 
+DEV_CONTAINER_NAME ?= $(USER)_$(subst /,_,$(PROJECT_NAME)____$(PROJECT_SOURCE_DIR))
+DEV_CONTAINER_IMAG ?= $(DOCKER_TAG_LINUX)
+test_in_dev_container:
+	docker ps | grep $(DEV_CONTAINER_NAME) \
+		&& docker exec -it $(DEV_CONTAINER_NAME) bash \
+		|| docker run --rm --name $(DEV_CONTAINER_NAME) \
+			--network host --security-opt seccomp=unconfined \
+			-v `pwd`:`pwd` -w `pwd` -it $(DEV_CONTAINER_IMAG) bash
+
+
 PYTHON ?= python3
+build:
+	$(PYTHON) -m pip install scikit_build_core pyproject_metadata pathspec pybind11
+	CMAKE_BUILD_PARALLEL_LEVEL=$(NUM_JOBS) $(PYTHON) -m pip install --no-build-isolation -Ceditable.rebuild=true -Cbuild-dir=build -ve.
 python_install:
-	$(PYTHON) setup.py install --force
-python_build:
-	$(PYTHON) setup.py bdist_wheel
+	$(PYTHON) -m pip install . --verbose
+python_wheel:
+	$(PYTHON) -m pip wheel . -w build --verbose
 python_sdist:
-	$(PYTHON) setup.py sdist
-	# tar -tvf dist/pybind11_rdp-*.tar.gz
-python_test:
-	$(PYTHON) -m pip install pytest rdp
-	$(PYTHON) -c 'from pybind11_rdp import rdp; print(rdp([[1, 1], [2, 2], [3, 3], [4, 4]]))'
-	pytest tests
-	$(PYTHON) test.py
+	$(PYTHON) -m pip install build
+	$(PYTHON) -m build --sdist --verbose
+python_test: pytest
+.PHONY: build
 
 # conda create -y -n py36 python=3.6
 # conda create -y -n py37 python=3.7
@@ -65,23 +83,24 @@ python_build_py310:
 	PYTHON=python conda run --no-capture-output -n py310 make python_build
 python_build_all: python_build_py36 python_build_py37 python_build_py38 python_build_py39 python_build_py310
 python_build_all_in_linux:
-	docker run --rm -w `pwd` -v `pwd`:`pwd` -v `pwd`/build/win:`pwd`/build -it $(DOCKER_TAG_LINUX) make python_build_all
+	docker run --rm -w `pwd` -v `pwd`:`pwd` -v `pwd`/build/linux:`pwd`/build -it $(DOCKER_TAG_LINUX) make python_build_all
 	make repair_wheels && rm -rf dist/*.whl && mv wheelhouse/*.whl dist && rm -rf wheelhouse
 python_build_all_in_macos: python_build_py38 python_build_py39 python_build_py310
 python_build_all_in_windows: python_build_all
 
 repair_wheels:
 	python -m pip install auditwheel # sudo apt install patchelf
-	ls dist/* | xargs -n1 auditwheel repair --plat manylinux2014_x86_64
+	ls dist/*-linux_x86_64.whl | xargs -n1 auditwheel repair --plat manylinux2014_x86_64
+	rm -rf dist/*-linux_x86_64.whl && cp wheelhouse/*.whl dist && rm -rf wheelhouse
 
 pypi_remote ?= pypi
 upload_wheels:
 	python -m pip install twine
 	twine upload dist/*.whl -r $(pypi_remote)
 
 tar.gz:
-	tar -cvz --exclude .git -f ../pybind11-rdp.tar.gz .
-	ls -alh ../pybind11-rdp.tar.gz
+	tar -cvz --exclude .git -f ../$(PROJECT_NAME).tar.gz .
+	ls -alh ../$(PROJECT_NAME).tar.gz
 
 # https://stackoverflow.com/a/25817631
 echo-%  : ; @echo -n $($*)