From 632a9d2c0f40b9859c7f74f79c8eac3c52c9b05c Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 7 Apr 2024 16:13:17 +0800 Subject: [PATCH 1/3] chore: update all pipx installation with renovate --- .github/workflows/ci.yml | 2 +- .gitlab/workflows/ci.yml | 2 +- .renovaterc.json | 15 +++++++++++++-- README.md | 6 +++--- docs/dev/dev-env.md | 4 ++-- docs/dev/proj.md | 2 +- includes/sample.jinja | 6 +++--- template/.renovaterc.json.jinja | 15 +++++++++++++-- .../workflows/ci.yml.jinja | 2 +- .../workflows/ci.yml.jinja | 2 +- template/docs/dev/dev-env.md | 4 ++-- template/docs/dev/proj.md.jinja | 2 +- 12 files changed, 42 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac9de9c6..8be2488f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: | git config --global user.name github-actions git config --global user.email github-actions@github.com - - run: pipx install copier + - run: pipx install copier==9.1.1 - run: make consistency - run: git diff - run: git status --porcelain diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index f307b7e8..c617eab7 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -30,7 +30,7 @@ consistency: script: - git config --global user.name gitlab-ci - git config --global user.email gitlab-ci@gitlab.com - - pipx install copier + - pipx install copier==9.1.1 - make consistency - git diff - git status --porcelain diff --git a/.renovaterc.json b/.renovaterc.json index cdf15c36..c7ea065b 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -5,8 +5,19 @@ "customType": "regex", "datasourceTemplate": "pypi", "fileMatch": [ - "^\\.devcontainer\\/Dockerfile$", - "^template\\/\\.devcontainer/Dockerfile\\.jinja$" + "^README.md", + "^\\.devcontainer/Dockerfile$", + "^\\.github/workflows/ci\\.yml", + "^\\.gitlab/workflows/ci\\.yml", + "^docs/dev/dev-env.md", + "^docs/dev/proj.md", + "^includes/sample.jinja", + "^template/.*\\.github.*/workflows/.+\\.yml(\\.jinja)?$", + "^template/.*\\.gitlab.*/workflows/.+\\.yml(\\.jinja)?$", + "^template/README.md.jinja", + "^template/\\.devcontainer/Dockerfile\\.jinja$", + "^template/docs/dev/dev-env.md", + "^template/docs/dev/proj.md" ], "matchStrings": [ "pipx install (?.*?)==(?.*?)[;\n]" diff --git a/README.md b/README.md index 3a3cf56e..7be02216 100644 --- a/README.md +++ b/README.md @@ -56,11 +56,11 @@ Certain system-level Python applications are needed and it is recommended to use ```bash # Copier: Template rendering for projects. -pipx install copier +pipx install copier==9.1.1 # PDM: A modern Python package and dependency manager supporting the latest PEP standards. -pipx install pdm +pipx install pdm==2.13.2 # Pre-commit: Automates Git hooks for code quality checks. -pipx install pre-commit +pipx install pre-commit==3.7.0 ``` ## 🚀 Quickstart diff --git a/docs/dev/dev-env.md b/docs/dev/dev-env.md index 69089d66..e9863359 100644 --- a/docs/dev/dev-env.md +++ b/docs/dev/dev-env.md @@ -12,9 +12,9 @@ Using `pipx` for management is recommended and you can find pipx's installation ```bash # PDM: A modern Python package and dependency manager supporting the latest PEP standards. -pipx install pdm +pipx install pdm==2.13.2 # Pre-commit: Automates Git hooks for code quality checks. -pipx install pre-commit +pipx install pre-commit==3.7.0 ``` ## Setup diff --git a/docs/dev/proj.md b/docs/dev/proj.md index 89e0f0b7..91cc1110 100644 --- a/docs/dev/proj.md +++ b/docs/dev/proj.md @@ -10,7 +10,7 @@ Using `pipx` for management is recommended and you can find pipx's installation ```bash # Copier: Template rendering for projects. -pipx install copier +pipx install copier==9.1.1 ``` ## Project Initialization diff --git a/includes/sample.jinja b/includes/sample.jinja index 7ffa8b6e..d3c047f1 100644 --- a/includes/sample.jinja +++ b/includes/sample.jinja @@ -37,11 +37,11 @@ Certain system-level Python applications are needed and it is recommended to use ```bash # Copier: Template rendering for projects. -pipx install copier +pipx install copier==9.1.1 # PDM: A modern Python package and dependency manager supporting the latest PEP standards. -pipx install pdm +pipx install pdm==2.13.2 # Pre-commit: Automates Git hooks for code quality checks. -pipx install pre-commit +pipx install pre-commit==3.7.0 ``` ## 🚀 Quickstart diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index bf4a0671..6d23fc62 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -6,9 +6,20 @@ "customType": "regex", "datasourceTemplate": "pypi", "fileMatch": [ - "^\\.devcontainer\\/Dockerfile$" + "^README.md", + "^\\.devcontainer/Dockerfile$", + "^\\.github/workflows/ci\\.yml", + "^\\.gitlab/workflows/ci\\.yml", + "^docs/dev/dev-env.md", + "^docs/dev/proj.md" [%- if project_name == "Serious Scaffold Python" %], - "^template\\/\\.devcontainer/Dockerfile\\.jinja$" + "^includes/sample.jinja", + "^template/.*\\.github.*/workflows/.+\\.yml(\\.jinja)?$", + "^template/.*\\.gitlab.*/workflows/.+\\.yml(\\.jinja)?$", + "^template/README.md.jinja", + "^template/\\.devcontainer/Dockerfile\\.jinja$", + "^template/docs/dev/dev-env.md", + "^template/docs/dev/proj.md" [%- endif %] ], "matchStrings": [ diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja index 354f0755..0344b2b7 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja @@ -54,7 +54,7 @@ jobs: run: | git config --global user.name github-actions git config --global user.email github-actions@github.com - - run: pipx install copier + - run: pipx install copier==9.1.1 - run: make consistency - run: git diff - run: git status --porcelain diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja index fea23399..1e8812fc 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja @@ -42,7 +42,7 @@ consistency: script: - git config --global user.name gitlab-ci - git config --global user.email gitlab-ci@gitlab.com - - pipx install copier + - pipx install copier==9.1.1 - make consistency - git diff - git status --porcelain diff --git a/template/docs/dev/dev-env.md b/template/docs/dev/dev-env.md index 69089d66..e9863359 100644 --- a/template/docs/dev/dev-env.md +++ b/template/docs/dev/dev-env.md @@ -12,9 +12,9 @@ Using `pipx` for management is recommended and you can find pipx's installation ```bash # PDM: A modern Python package and dependency manager supporting the latest PEP standards. -pipx install pdm +pipx install pdm==2.13.2 # Pre-commit: Automates Git hooks for code quality checks. -pipx install pre-commit +pipx install pre-commit==3.7.0 ``` ## Setup diff --git a/template/docs/dev/proj.md.jinja b/template/docs/dev/proj.md.jinja index 988d95cd..feaeb5a6 100644 --- a/template/docs/dev/proj.md.jinja +++ b/template/docs/dev/proj.md.jinja @@ -10,7 +10,7 @@ Using `pipx` for management is recommended and you can find pipx's installation ```bash # Copier: Template rendering for projects. -pipx install copier +pipx install copier==9.1.1 ``` ## Project Initialization From 65bd566ecb3404ae0c6b52cac0fe7435c906c5f5 Mon Sep 17 00:00:00 2001 From: "huxuan-assistant[bot]" <163485190+huxuan-assistant[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 16:34:29 +0800 Subject: [PATCH 2/3] chore(deps): update dependency copier to v9.2.0 (#85) Co-authored-by: Renovate GitHub Bot --- .github/workflows/ci.yml | 2 +- .gitlab/workflows/ci.yml | 2 +- README.md | 2 +- docs/dev/proj.md | 2 +- includes/sample.jinja | 2 +- .../workflows/ci.yml.jinja | 2 +- .../workflows/ci.yml.jinja | 2 +- template/docs/dev/proj.md.jinja | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8be2488f..16713365 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: | git config --global user.name github-actions git config --global user.email github-actions@github.com - - run: pipx install copier==9.1.1 + - run: pipx install copier==9.2.0 - run: make consistency - run: git diff - run: git status --porcelain diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index c617eab7..21d0090d 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -30,7 +30,7 @@ consistency: script: - git config --global user.name gitlab-ci - git config --global user.email gitlab-ci@gitlab.com - - pipx install copier==9.1.1 + - pipx install copier==9.2.0 - make consistency - git diff - git status --porcelain diff --git a/README.md b/README.md index 7be02216..c201787b 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Certain system-level Python applications are needed and it is recommended to use ```bash # Copier: Template rendering for projects. -pipx install copier==9.1.1 +pipx install copier==9.2.0 # PDM: A modern Python package and dependency manager supporting the latest PEP standards. pipx install pdm==2.13.2 # Pre-commit: Automates Git hooks for code quality checks. diff --git a/docs/dev/proj.md b/docs/dev/proj.md index 91cc1110..61c78745 100644 --- a/docs/dev/proj.md +++ b/docs/dev/proj.md @@ -10,7 +10,7 @@ Using `pipx` for management is recommended and you can find pipx's installation ```bash # Copier: Template rendering for projects. -pipx install copier==9.1.1 +pipx install copier==9.2.0 ``` ## Project Initialization diff --git a/includes/sample.jinja b/includes/sample.jinja index d3c047f1..a91deea6 100644 --- a/includes/sample.jinja +++ b/includes/sample.jinja @@ -37,7 +37,7 @@ Certain system-level Python applications are needed and it is recommended to use ```bash # Copier: Template rendering for projects. -pipx install copier==9.1.1 +pipx install copier==9.2.0 # PDM: A modern Python package and dependency manager supporting the latest PEP standards. pipx install pdm==2.13.2 # Pre-commit: Automates Git hooks for code quality checks. diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja index 0344b2b7..6425702b 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja @@ -54,7 +54,7 @@ jobs: run: | git config --global user.name github-actions git config --global user.email github-actions@github.com - - run: pipx install copier==9.1.1 + - run: pipx install copier==9.2.0 - run: make consistency - run: git diff - run: git status --porcelain diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja index 1e8812fc..7c8bc5e4 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja @@ -42,7 +42,7 @@ consistency: script: - git config --global user.name gitlab-ci - git config --global user.email gitlab-ci@gitlab.com - - pipx install copier==9.1.1 + - pipx install copier==9.2.0 - make consistency - git diff - git status --porcelain diff --git a/template/docs/dev/proj.md.jinja b/template/docs/dev/proj.md.jinja index feaeb5a6..93ceced9 100644 --- a/template/docs/dev/proj.md.jinja +++ b/template/docs/dev/proj.md.jinja @@ -10,7 +10,7 @@ Using `pipx` for management is recommended and you can find pipx's installation ```bash # Copier: Template rendering for projects. -pipx install copier==9.1.1 +pipx install copier==9.2.0 ``` ## Project Initialization From 3453d99c27c99fe6115d8eb0a93952ff66d2b51b Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 7 Apr 2024 16:46:52 +0800 Subject: [PATCH 3/3] more general file match --- .renovaterc.json | 15 ++++++--------- template/.renovaterc.json.jinja | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.renovaterc.json b/.renovaterc.json index c7ea065b..a02562e7 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -5,19 +5,16 @@ "customType": "regex", "datasourceTemplate": "pypi", "fileMatch": [ - "^README.md", + "^README\\.md$", "^\\.devcontainer/Dockerfile$", - "^\\.github/workflows/ci\\.yml", - "^\\.gitlab/workflows/ci\\.yml", - "^docs/dev/dev-env.md", - "^docs/dev/proj.md", - "^includes/sample.jinja", + "^\\.github/workflows/.+\\.yml$", + "^\\.gitlab/workflows/.+\\.yml$", + "^docs/.+\\.md$", + "^includes/sample\\.jinja$", "^template/.*\\.github.*/workflows/.+\\.yml(\\.jinja)?$", "^template/.*\\.gitlab.*/workflows/.+\\.yml(\\.jinja)?$", - "^template/README.md.jinja", "^template/\\.devcontainer/Dockerfile\\.jinja$", - "^template/docs/dev/dev-env.md", - "^template/docs/dev/proj.md" + "^template/docs/.+\\.md(\\.jinja)?$" ], "matchStrings": [ "pipx install (?.*?)==(?.*?)[;\n]" diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 6d23fc62..aab36057 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -6,20 +6,17 @@ "customType": "regex", "datasourceTemplate": "pypi", "fileMatch": [ - "^README.md", + "^README\\.md$", "^\\.devcontainer/Dockerfile$", - "^\\.github/workflows/ci\\.yml", - "^\\.gitlab/workflows/ci\\.yml", - "^docs/dev/dev-env.md", - "^docs/dev/proj.md" + "^\\.github/workflows/.+\\.yml$", + "^\\.gitlab/workflows/.+\\.yml$", + "^docs/.+\\.md$" [%- if project_name == "Serious Scaffold Python" %], - "^includes/sample.jinja", + "^includes/sample\\.jinja$", "^template/.*\\.github.*/workflows/.+\\.yml(\\.jinja)?$", "^template/.*\\.gitlab.*/workflows/.+\\.yml(\\.jinja)?$", - "^template/README.md.jinja", "^template/\\.devcontainer/Dockerfile\\.jinja$", - "^template/docs/dev/dev-env.md", - "^template/docs/dev/proj.md" + "^template/docs/.+\\.md(\\.jinja)?$" [%- endif %] ], "matchStrings": [