From 0936791f6770e7c0d77406e0f7e9610fda1c8334 Mon Sep 17 00:00:00 2001 From: Clarmy Lee Date: Thu, 2 Apr 2026 17:12:33 +0800 Subject: [PATCH 1/5] Add Python 3.13 and 3.14 support --- .github/workflows/ci.yml | 8 ++++++-- .github/workflows/pypi-publish.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 379d629..fd49490 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,12 @@ on: jobs: check: - name: Lint, validate and build + name: Lint, validate and build (${{ matrix.python-version }}) runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"] steps: - uses: actions/checkout@v4 @@ -18,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 65c5229..1b89978 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.14" - name: Install build backend run: python -m pip install --upgrade build diff --git a/pyproject.toml b/pyproject.toml index 0edcc45..2bc829a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ include = [ exclude = ["**/.DS_Store"] [tool.poetry.dependencies] -python = ">=3.9,<3.13" +python = ">=3.9,<3.15" tqdm = "^4.67.1" [tool.poetry.group.dev.dependencies] From 967b45d88cd3f5b220149da5c7f40f0df7ae3d17 Mon Sep 17 00:00:00 2001 From: Clarmy Lee Date: Thu, 2 Apr 2026 17:17:26 +0800 Subject: [PATCH 2/5] Relax Python constraint and trim runtime deps --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2bc829a..4161449 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,12 +15,12 @@ include = [ exclude = ["**/.DS_Store"] [tool.poetry.dependencies] -python = ">=3.9,<3.15" -tqdm = "^4.67.1" +python = ">=3.9" [tool.poetry.group.dev.dependencies] flake8 = "^7.3.0" build = "^1.4.2" +tqdm = "^4.67.1" [tool.poetry.scripts] cnmaps-data-check = "cnmaps_data.checker:main" From 14a085721166dd5de943ebb1b73e6047f71f9247 Mon Sep 17 00:00:00 2001 From: Clarmy Lee Date: Thu, 2 Apr 2026 17:19:16 +0800 Subject: [PATCH 3/5] Expand cnmaps-data CI to multiple platforms --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd49490..f7b6937 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,11 +9,12 @@ on: jobs: check: - name: Lint, validate and build (${{ matrix.python-version }}) - runs-on: ubuntu-latest + name: Lint, validate and build (${{ matrix.python-version }}, ${{ matrix.os }}) + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: + os: ["ubuntu-latest", "macos-latest", "windows-latest"] python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"] steps: From b08f7b13bd876a5bd909f32bad9b67562788276b Mon Sep 17 00:00:00 2001 From: Clarmy Lee Date: Thu, 2 Apr 2026 17:22:52 +0800 Subject: [PATCH 4/5] Bump version to 1.1.2 --- CHANGELOG.md | 6 ++++++ cnmaps_data/__init__.py | 2 +- cnmaps_data/manifest.json | 2 +- pyproject.toml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e86f90..5142210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ `cnmaps-data` 的重要变更会记录在这里。 +## 1.1.2 + +- Relax Python version constraints to avoid blocking future Python 3.x releases by default. +- Move `tqdm` from runtime dependencies to development-only dependencies. +- Expand CI coverage to Python 3.9-3.14 on Ubuntu, macOS, and Windows. + ## 1.1.1 - 切换国外国家级边界到世界银行官方边界源，并补充中国周边边界处理说明与示意图。 diff --git a/cnmaps_data/__init__.py b/cnmaps_data/__init__.py index 27c0e5b..5b90b94 100644 --- a/cnmaps_data/__init__.py +++ b/cnmaps_data/__init__.py @@ -1,3 +1,3 @@ """Official data package for cnmaps.""" -__version__ = "1.1.1" +__version__ = "1.1.2" diff --git a/cnmaps_data/manifest.json b/cnmaps_data/manifest.json index dc28ba2..18cd539 100644 --- a/cnmaps_data/manifest.json +++ b/cnmaps_data/manifest.json @@ -1,7 +1,7 @@ { "name": "cnmaps-data", "provider": "official", - "version": "1.1.1", + "version": "1.1.2", "cnmaps_data_api_version": "1", "datasets": { "administrative": { diff --git a/pyproject.toml b/pyproject.toml index 4161449..944e713 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cnmaps-data" -version = "1.1.1" +version = "1.1.2" description = "Official data package for cnmaps" authors = ["Clarmy "] license = "MIT" From a5d51014937230cdb88f8ba2485d4ccbd1067dc8 Mon Sep 17 00:00:00 2001 From: Clarmy Lee Date: Thu, 2 Apr 2026 17:24:14 +0800 Subject: [PATCH 5/5] Localize changelog entry for 1.1.2 --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5142210..215c7be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ ## 1.1.2 -- Relax Python version constraints to avoid blocking future Python 3.x releases by default. -- Move `tqdm` from runtime dependencies to development-only dependencies. -- Expand CI coverage to Python 3.9-3.14 on Ubuntu, macOS, and Windows. +- 放宽 Python 版本约束，默认不再因为未来 Python 3.x 新版本发布而阻塞安装。 +- 将 `tqdm` 从运行时依赖调整为仅开发依赖，避免普通用户安装时引入不必要的额外依赖。 +- 将 CI 扩展为在 Ubuntu、macOS、Windows 上覆盖 Python 3.9-3.14。 ## 1.1.1