sync version

Author: haochengxia

CMakeLists.txt

@@ -274,7 +274,14 @@ set_target_properties(libcachesim_python PROPERTIES
     INSTALL_RPATH "$ORIGIN"
 )
 
-target_compile_definitions(libcachesim_python PRIVATE VERSION_INFO=${PROJECT_VERSION})
+if(DEFINED SKBUILD_PROJECT_VERSION AND NOT SKBUILD_PROJECT_VERSION STREQUAL "")
+    set(LCS_PYTHON_VERSION ${SKBUILD_PROJECT_VERSION})
+else()
+    set(LCS_PYTHON_VERSION "dev")
+endif()
+message(STATUS "libcachesim_python version: ${LCS_PYTHON_VERSION}")
+
+target_compile_definitions(libcachesim_python PRIVATE VERSION_INFO=${LCS_PYTHON_VERSION})
 
 # =============================================================================
 # Platform-Specific Configuration

docs/src/en/getting_started/installation.md

@@ -128,17 +128,26 @@ dependencies that CMake looks for at configure time: **pkg-config**, **GLib 2.0*
 `find_package(ZSTD REQUIRED)` — and a missing one aborts configuration before any code is
 compiled, with an error such as `No package 'glib-2.0' found`.
 
-The dependency scripts above install them on the platforms they cover (`install_deps.sh` targets
-yum-based distributions and macOS). On Debian/Ubuntu, use the submodule's script or install them
-directly:
+`scripts/install_deps.sh` installs them on Debian/Ubuntu, CentOS/RHEL and macOS, picking the
+package manager to use automatically. It calls `sudo` only when not already running as root:
 
 ```bash
-bash src/libCacheSim/scripts/install_dependency.sh
+bash scripts/install_deps.sh
+```
+
+Or, on Debian/Ubuntu or macOS, install just the three by hand:
 
-# or, the minimum needed to configure the build
+```bash
+# Debian/Ubuntu
 sudo apt install -y pkg-config libglib2.0-dev libzstd-dev
+
+# macOS
+brew install pkgconf glib zstd
 ```
 
+On CentOS/RHEL prefer the script: it builds Zstandard from source, because the version in the
+base repositories is often too old.
+
 The build itself is driven by [scikit-build-core](https://scikit-build-core.readthedocs.io/),
 which configures and builds the bundled C library before compiling the
 [pybind11](https://pybind11.readthedocs.io/) bindings.

docs/src/zh/getting_started/installation.md

@@ -107,15 +107,24 @@ bash scripts/install.sh --all
 
 构建扩展需要支持 C++17 的编译器、CMake ≥ 3.15 以及 Ninja，另外还需要三个在 configure 阶段查找的原生依赖：**pkg-config**、**GLib 2.0** 和 **Zstandard**。这三者都是必需的——`CMakeLists.txt` 中分别以 `find_package(PkgConfig REQUIRED)`、`pkg_check_modules(GLib REQUIRED glib-2.0)` 和 `find_package(ZSTD REQUIRED)` 声明——缺少任意一个都会在编译任何代码之前中断配置，并报出类似 `No package 'glib-2.0' found` 的错误。
 
-上文的依赖脚本会在其支持的平台上安装它们（`install_deps.sh` 面向基于 yum 的发行版和 macOS）。在 Debian/Ubuntu 上，请使用子模块提供的脚本，或直接安装：
+`scripts/install_deps.sh` 会在 Debian/Ubuntu、CentOS/RHEL 和 macOS 上安装它们，并自动选择对应的包管理器；只有在非 root 身份运行时才会调用 `sudo`：
 
 ```bash
-bash src/libCacheSim/scripts/install_dependency.sh
+bash scripts/install_deps.sh
+```
+
+如果不想运行该脚本，在 Debian/Ubuntu 或 macOS 上也可以手动只安装这三个依赖：
 
-# 或者只装配置构建所需的最小集合
+```bash
+# Debian/Ubuntu
 sudo apt install -y pkg-config libglib2.0-dev libzstd-dev
+
+# macOS
+brew install pkgconf glib zstd
 ```
 
+在 CentOS/RHEL 上建议直接使用脚本：它会从源码构建 Zstandard，因为基础仓库中的版本通常过旧。
+
 构建本身由 [scikit-build-core](https://scikit-build-core.readthedocs.io/) 驱动，它会先配置并构建内置的 C 库，再编译 [pybind11](https://pybind11.readthedocs.io/) 绑定。
 
 ## 疑难排查

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "libcachesim"
-version = "0.3.3.post4"
+version = "0.3.5"
 description="Python bindings for libCacheSim"
 readme = "README.md"
 requires-python = ">=3.10"

scripts/install_deps.sh

@@ -21,6 +21,22 @@ log_error() {
 	echo -e "${RED}[ERROR]${NC} $1" >&2
 }
 
+# Elevation helper.
+#
+# This script is both a developer convenience and cibuildwheel's `before-all`
+# (see [tool.cibuildwheel] in pyproject.toml), where it runs as root inside the
+# manylinux container with no sudo available. Running as root leaves SUDO empty,
+# so every command below is byte-for-byte what it was before this helper existed.
+SUDO=""
+if [[ ${EUID} -ne 0 ]]; then
+	if command -v sudo >/dev/null 2>&1; then
+		SUDO="sudo"
+	else
+		log_error "This script needs root privileges, but neither root nor sudo is available."
+		exit 1
+	fi
+fi
+
 # Install and configure g++ version
 install_gcc() {
 	log_info "Installing and configuring g++ version..."
@@ -96,7 +112,7 @@ install_zstd() {
 	pushd _build >/dev/null
 	cmake -G Ninja ..
 	ninja
-	ninja install
+	${SUDO} ninja install
 	popd >/dev/null
 	popd >/dev/null
 	popd >/dev/null
@@ -114,7 +130,7 @@ install_xgboost() {
 	pushd build >/dev/null
 	cmake -G Ninja ..
 	ninja
-	ninja install
+	${SUDO} ninja install
 	popd >/dev/null
 	popd >/dev/null
 	popd >/dev/null
@@ -132,16 +148,45 @@ install_lightgbm() {
 	pushd build >/dev/null
 	cmake -G Ninja ..
 	ninja
-	ninja install
+	${SUDO} ninja install
 	popd >/dev/null
 	popd >/dev/null
 	popd >/dev/null
 }
 
-# Detect OS and install dependencies
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-	log_info "Detected Linux system, installing dependencies via yum..."
-	
+# Detect OS and install dependencies.
+#
+# Dispatch on the available package manager rather than on $OSTYPE alone, so that
+# this covers the same platforms as upstream's
+# src/libCacheSim/scripts/install_dependency.sh (Debian/Ubuntu/WSL, macOS,
+# CentOS/RHEL). macOS is matched first; the manylinux images used for the release
+# wheels ship yum/dnf but no apt-get, so they still take the yum branch below.
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	log_info "Detected macOS system, installing dependencies via brew..."
+
+	# Install basic dependencies via Homebrew
+	brew install glib google-perftools argp-standalone xxhash llvm wget cmake ninja zstd xgboost lightgbm
+
+elif command -v apt-get >/dev/null 2>&1; then
+	log_info "Detected Debian/Ubuntu system, installing dependencies via apt..."
+
+	${SUDO} apt-get update
+	# CMakeLists.txt requires pkg-config, GLib 2.0 and Zstandard; the rest mirrors
+	# upstream's setup_ubuntu. Unlike the yum branch there is no need to build CMake
+	# or Zstd from source, since apt ships cmake >= 3.15 and libzstd-dev.
+	${SUDO} apt-get install -y --no-install-recommends \
+		build-essential pkg-config git wget cmake ninja-build \
+		libglib2.0-dev libzstd-dev \
+		libgoogle-perftools-dev google-perftools xxhash libunwind-dev
+
+	# Needed by the optional learned algorithms (ENABLE_GLCACHE / ENABLE_3L_CACHE /
+	# ENABLE_LRB); no distro packages provide the CMake config files these need.
+	install_xgboost
+	install_lightgbm
+
+elif command -v yum >/dev/null 2>&1 || command -v dnf >/dev/null 2>&1; then
+	log_info "Detected CentOS/RHEL system, installing dependencies via yum..."
+
 	# Enable EPEL repository
 	yum install -y epel-release
 
@@ -167,15 +212,9 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
 	install_zstd
 	install_xgboost
 	install_lightgbm
-	
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-	log_info "Detected macOS system, installing dependencies via brew..."
-	
-	# Install basic dependencies via Homebrew
-	brew install glib google-perftools argp-standalone xxhash llvm wget cmake ninja zstd xgboost lightgbm
-	
+
 else
-	log_error "Unsupported operating system: $OSTYPE"
+	log_error "Unsupported operating system: $OSTYPE (no brew, apt-get, yum or dnf found)"
 	exit 1
 fi
 

scripts/sync_version.py

@@ -13,6 +13,13 @@
 from pathlib import Path
 
 
+# Matches the [project] version line. The trailing [^"]* accepts PEP 440 suffixes such
+# as ".post4", "rc1" or ".dev0" -- an earlier pattern required exactly N.N.N, so a
+# version like "0.3.3.post4" matched nothing and this script silently stopped syncing.
+# Anchoring on "dev" or a leading digit keeps it from matching pins like ">=3.15".
+VERSION_LINE_RE = r"version = \"(dev|[0-9]+\.[0-9]+\.[0-9]+[^\"]*)\""
+
+
 def get_project_root():
     """Get the project root directory."""
     script_dir = Path(__file__).parent
@@ -52,7 +59,7 @@ def update_pyproject_toml(version):
         pyproject_data = f.read()
 
     # Update the version line in pyproject.toml, make it can match any version in version.txt, like "0.3.1" or "dev"
-    match = re.search(r"version = \"(dev|[0-9]+\.[0-9]+\.[0-9]+)\"", pyproject_data)
+    match = re.search(VERSION_LINE_RE, pyproject_data)
     if not match:
         print("Error: Could not find a valid version line in pyproject.toml", file=sys.stderr)
         return False
@@ -65,7 +72,8 @@ def update_pyproject_toml(version):
         print(f"Warning: pyproject version {current_version} is newer than version.txt {version}, skipping update")
         return False
     # replace the version line with the new version
-    pyproject_data = re.sub(r"version = \"(dev|[0-9]+\.[0-9]+\.[0-9]+)\"", f'version = "{version}"', pyproject_data)
+    # count=1: only the [project] version, never the tool version pins further down.
+    pyproject_data = re.sub(VERSION_LINE_RE, f'version = "{version}"', pyproject_data, count=1)
 
     # Write back to file with proper formatting
     with open(pyproject_toml_path, "w") as f: