From 1209e950957bde0312d76df8394704ab6fd2d5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E7=8E=AE=20=28Jade=20Lin=29?= Date: Sun, 24 Nov 2024 10:40:02 +0800 Subject: [PATCH] build: update toolchains --- .github/workflows/release.yml | 1 + .github/workflows/test.yml | 1 + Makefile | 1 + pdm.lock | 4 ++-- pyproject.toml | 10 +++++----- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4039317..9621fb9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,7 @@ jobs: uses: pdm-project/setup-pdm@v2.5 with: python-version: 3.9 + version: 2.19.2 - name: Build release run: | pdm build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d40b9f..31e91de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,7 @@ jobs: uses: pdm-project/setup-pdm@v3 with: python-version: 3.13 + version: 2.19.2 - name: Cache Nox Virtualenvs uses: actions/cache@v1 with: diff --git a/Makefile b/Makefile index 9d2d6d9..7d13095 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ init: pdm info && pdm info --env pdm sync --no-editable -v $(EXTRAS_ARGS) $(DEV_EXTRAS_ARGS) pdm config -l python.use_venv true + pdm config -l strategy.inherit_metadata true deinit: rm -rf .nox diff --git a/pdm.lock b/pdm.lock index b21a22c..4b5741d 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "build_readme", "docs", "parser", "test"] strategy = ["inherit_metadata"] lock_version = "4.5.0" -content_hash = "sha256:ec5eb196a205eebd7abb09f10de6b85affa0f0aca3450ee5ac4815a44fbf3842" +content_hash = "sha256:fcbc4831dd3986a9cd5e09289f95ec76cffd10b2e4ae2dac54e22ce54e9d1a58" [[metadata.targets]] requires_python = ">=3.9" @@ -712,7 +712,7 @@ files = [ [[package]] name = "tornado" version = "6.4.2" -requires_python = ">=3.8" +requires_python = ">= 3.8" summary = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." groups = ["docs"] files = [ diff --git a/pyproject.toml b/pyproject.toml index 769f4f0..2262507 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,13 +30,13 @@ repository = "https://github.com/linw1995/jsonpath" documentation = "https://jsonpath.rtfd.io/en/latest/" [project.optional-dependencies] -parser = ["lark ~= 1.2"] +parser = ["lark~=1.2"] [project.scripts] jp = "jsonpath.cli:main" [build-system] -requires = ["pdm-pep517", "lark ~= 1.2"] +requires = ["pdm-pep517", "lark~=1.2"] backend-path = ["."] build-backend = "jsonpath_build" @@ -55,6 +55,6 @@ version = { use_scm = true } lock = ["-S", "inherit_metadata,no_cross_platform"] [tool.pdm.dev-dependencies] -docs = ["sphinx~=7.4", "livereload ~= 2.6", "lark ~= 1.2", "tornado>=6.3.2"] -test = ["pytest-cov ~= 5.0", "pytest ~= 8.0", "pexpect ~= 4.8", "sybil ~= 8.0"] -build_readme = ["pygments ~= 2.8", "docutils >= 0.16"] +docs = ["sphinx~=7.4", "livereload~=2.6", "lark~=1.2", "tornado>=6.3.2"] +test = ["pytest-cov~=5.0", "pytest~=8.0", "pexpect~=4.8", "sybil~=8.0"] +build_readme = ["pygments~=2.8", "docutils>=0.16"]