From 642d55c50de3c9c69ae420c7ced844d2bc76cbb4 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 6 Mar 2024 09:43:02 +0800 Subject: [PATCH 1/7] chore: drop Python 3.8 support --- .copier-data.yml | 2 +- .github/workflows/ci.yml | 1 - .github/workflows/devcontainer.yml | 1 - .github/workflows/release.yml | 1 - .gitlab/workflows/ci.yml | 1 - .gitlab/workflows/devcontainer.yml | 1 - .gitlab/workflows/release.yml | 1 - pyproject.toml | 3 +-- 8 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.copier-data.yml b/.copier-data.yml index 00ec2f91..29232c5c 100644 --- a/.copier-data.yml +++ b/.copier-data.yml @@ -7,7 +7,7 @@ coverage_threshold: 100 default_py: '3.12' development_status: Alpha max_py: '3.12' -min_py: '3.8' +min_py: '3.9' module_name: ss_python organization_name: Serious Scaffold package_name: ss-python diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 954cbb84..5daf9f3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,6 @@ jobs: strategy: matrix: python-version: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index 660bbb46..e92797b0 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -33,7 +33,6 @@ jobs: strategy: matrix: python-version: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce2f8934..1ee4f695 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,7 +98,6 @@ jobs: strategy: matrix: python-version: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index 711de24d..692c8da1 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -10,7 +10,6 @@ ci: parallel: matrix: - PYTHON_VERSION: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.gitlab/workflows/devcontainer.yml b/.gitlab/workflows/devcontainer.yml index 68fd040d..1645a2e8 100644 --- a/.gitlab/workflows/devcontainer.yml +++ b/.gitlab/workflows/devcontainer.yml @@ -3,7 +3,6 @@ dev-container-publish: parallel: matrix: - PYTHON_VERSION: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml index 7e55ee2a..3019d23d 100644 --- a/.gitlab/workflows/release.yml +++ b/.gitlab/workflows/release.yml @@ -30,7 +30,6 @@ container-publish: parallel: matrix: - PYTHON_VERSION: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/pyproject.toml b/pyproject.toml index 8dfae0f1..0dac68d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,6 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", ] dependencies = [ @@ -35,7 +34,7 @@ keywords = [ license = {text = "MIT"} name = "ss-python" readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" [project.scripts] ss-python-cli = "ss_python.cli:app" From a124be6f6a28010728a2153b2df0048208f3dff4 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 6 Mar 2024 09:44:30 +0800 Subject: [PATCH 2/7] update pdm lock --- pdm.lock | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/pdm.lock b/pdm.lock index ccda931d..afea1b2a 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "doc", "lint", "test"] strategy = ["cross_platform", "inherit_metadata"] lock_version = "4.4.1" -content_hash = "sha256:45ec5c321b8ce19fd9b454e51079a824f63141ad15f39bee67a7f000f91f72fd" +content_hash = "sha256:ee168a26854b3d09b6ca1d5797ce6f2a7417208d7175585a5708a2d70e16d7c5" [[package]] name = "alabaster" @@ -24,9 +24,6 @@ version = "0.6.0" requires_python = ">=3.8" summary = "Reusable constraint types to use with typing.Annotated" groups = ["default", "doc"] -dependencies = [ - "typing-extensions>=4.0.0; python_version < \"3.9\"", -] files = [ {file = "annotated_types-0.6.0-py3-none-any.whl", hash = "sha256:0641064de18ba7a25dee8f96403ebc39113d0cb953a01429249d5c7564666a43"}, {file = "annotated_types-0.6.0.tar.gz", hash = "sha256:563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d"}, @@ -50,7 +47,6 @@ summary = "Seamlessly integrate pydantic models in your Sphinx documentation." groups = ["doc"] dependencies = [ "Sphinx>=4.0", - "importlib-metadata>1; python_version <= \"3.8\"", "pydantic-settings<3.0.0,>=2.0", "pydantic<3.0.0,>=2.0", ] @@ -65,9 +61,6 @@ version = "2.14.0" requires_python = ">=3.7" summary = "Internationalization utilities" groups = ["doc"] -dependencies = [ - "pytz>=2015.7; python_version < \"3.9\"", -] files = [ {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"}, {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, @@ -882,17 +875,6 @@ files = [ {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"}, ] -[[package]] -name = "pytz" -version = "2023.3.post1" -summary = "World timezone definitions, modern and historical" -groups = ["doc"] -marker = "python_version < \"3.9\"" -files = [ - {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"}, - {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"}, -] - [[package]] name = "pyyaml" version = "6.0.1" @@ -966,7 +948,6 @@ groups = ["default"] dependencies = [ "markdown-it-py>=2.2.0", "pygments<3.0.0,>=2.13.0", - "typing-extensions<5.0,>=4.0.0; python_version < \"3.9\"", ] files = [ {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"}, From 9fe85aa2b8670241214b4096b772c4e41c98a01f Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 6 Mar 2024 10:26:21 +0800 Subject: [PATCH 3/7] ci: remove reundant permissions --- .github/workflows/devcontainer.yml | 1 - .github/workflows/release.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index e92797b0..2dc7da01 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -5,7 +5,6 @@ concurrency: jobs: dev-container-publish: permissions: - contents: read packages: write runs-on: ubuntu-22.04 steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ee4f695..2e635e71 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,6 @@ jobs: container-publish: needs: release-publish permissions: - contents: read packages: write runs-on: ubuntu-22.04 steps: From d8304dac70b4ce3bae418ea2a119e988db88a184 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 6 Mar 2024 10:56:42 +0800 Subject: [PATCH 4/7] ci: set GIT_STRATEGY to none for speicific jobs --- .gitlab/workflows/commitlint.yml | 2 ++ .gitlab/workflows/release.yml | 4 ++++ .gitlab/workflows/renovate.yml | 1 + 3 files changed, 7 insertions(+) diff --git a/.gitlab/workflows/commitlint.yml b/.gitlab/workflows/commitlint.yml index 4385eb55..7e06471c 100644 --- a/.gitlab/workflows/commitlint.yml +++ b/.gitlab/workflows/commitlint.yml @@ -14,3 +14,5 @@ commitlint: echo "$CI_MERGE_REQUEST_TITLE" | commitlint fi stage: ci + variables: + GIT_STRATEGY: none diff --git a/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml index 3019d23d..420892e2 100644 --- a/.gitlab/workflows/release.yml +++ b/.gitlab/workflows/release.yml @@ -23,6 +23,8 @@ release-publish: script: - echo "Running the release job." stage: release + variables: + GIT_STRATEGY: none container-publish: image: docker:25.0.3@sha256:0d70c541ee98e66b8f7ece8c0e9f7910732466e337a9087c2ac2868ef0775092 needs: @@ -90,3 +92,5 @@ pages: script: - echo "Running the pages job." stage: release + variables: + GIT_STRATEGY: none diff --git a/.gitlab/workflows/renovate.yml b/.gitlab/workflows/renovate.yml index 8bc69b5c..02470e83 100644 --- a/.gitlab/workflows/renovate.yml +++ b/.gitlab/workflows/renovate.yml @@ -9,6 +9,7 @@ renovate: script: renovate $RENOVATE_EXTRA_FLAG stage: build variables: + GIT_STRATEGY: none LOG_LEVEL: debug RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier"]' RENOVATE_BASE_DIR: $CI_PROJECT_DIR/renovate From 097d69e21f4e1ca4a5fab8f5689f92fa43582477 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 6 Mar 2024 21:31:38 +0800 Subject: [PATCH 5/7] Revert "chore: drop Python 3.8 support" This reverts commit 642d55c50de3c9c69ae420c7ced844d2bc76cbb4. --- .copier-data.yml | 2 +- .github/workflows/ci.yml | 1 + .github/workflows/devcontainer.yml | 1 + .github/workflows/release.yml | 1 + .gitlab/workflows/ci.yml | 1 + .gitlab/workflows/devcontainer.yml | 1 + .gitlab/workflows/release.yml | 1 + pyproject.toml | 3 ++- 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.copier-data.yml b/.copier-data.yml index 29232c5c..00ec2f91 100644 --- a/.copier-data.yml +++ b/.copier-data.yml @@ -7,7 +7,7 @@ coverage_threshold: 100 default_py: '3.12' development_status: Alpha max_py: '3.12' -min_py: '3.9' +min_py: '3.8' module_name: ss_python organization_name: Serious Scaffold package_name: ss-python diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5daf9f3e..954cbb84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,7 @@ jobs: strategy: matrix: python-version: + - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index 2dc7da01..deb910e8 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -32,6 +32,7 @@ jobs: strategy: matrix: python-version: + - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e635e71..f2cacea9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,6 +97,7 @@ jobs: strategy: matrix: python-version: + - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index 692c8da1..711de24d 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -10,6 +10,7 @@ ci: parallel: matrix: - PYTHON_VERSION: + - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.gitlab/workflows/devcontainer.yml b/.gitlab/workflows/devcontainer.yml index 1645a2e8..68fd040d 100644 --- a/.gitlab/workflows/devcontainer.yml +++ b/.gitlab/workflows/devcontainer.yml @@ -3,6 +3,7 @@ dev-container-publish: parallel: matrix: - PYTHON_VERSION: + - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml index 420892e2..8ab95009 100644 --- a/.gitlab/workflows/release.yml +++ b/.gitlab/workflows/release.yml @@ -32,6 +32,7 @@ container-publish: parallel: matrix: - PYTHON_VERSION: + - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/pyproject.toml b/pyproject.toml index 0dac68d5..8dfae0f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,6 +15,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", ] dependencies = [ @@ -34,7 +35,7 @@ keywords = [ license = {text = "MIT"} name = "ss-python" readme = "README.md" -requires-python = ">=3.9" +requires-python = ">=3.8" [project.scripts] ss-python-cli = "ss_python.cli:app" From 9b3ba296b9bf268d97c682ce73d5f864c1c4be68 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 6 Mar 2024 21:31:58 +0800 Subject: [PATCH 6/7] Revert "update pdm lock" This reverts commit a124be6f6a28010728a2153b2df0048208f3dff4. --- pdm.lock | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pdm.lock b/pdm.lock index afea1b2a..ccda931d 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "doc", "lint", "test"] strategy = ["cross_platform", "inherit_metadata"] lock_version = "4.4.1" -content_hash = "sha256:ee168a26854b3d09b6ca1d5797ce6f2a7417208d7175585a5708a2d70e16d7c5" +content_hash = "sha256:45ec5c321b8ce19fd9b454e51079a824f63141ad15f39bee67a7f000f91f72fd" [[package]] name = "alabaster" @@ -24,6 +24,9 @@ version = "0.6.0" requires_python = ">=3.8" summary = "Reusable constraint types to use with typing.Annotated" groups = ["default", "doc"] +dependencies = [ + "typing-extensions>=4.0.0; python_version < \"3.9\"", +] files = [ {file = "annotated_types-0.6.0-py3-none-any.whl", hash = "sha256:0641064de18ba7a25dee8f96403ebc39113d0cb953a01429249d5c7564666a43"}, {file = "annotated_types-0.6.0.tar.gz", hash = "sha256:563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d"}, @@ -47,6 +50,7 @@ summary = "Seamlessly integrate pydantic models in your Sphinx documentation." groups = ["doc"] dependencies = [ "Sphinx>=4.0", + "importlib-metadata>1; python_version <= \"3.8\"", "pydantic-settings<3.0.0,>=2.0", "pydantic<3.0.0,>=2.0", ] @@ -61,6 +65,9 @@ version = "2.14.0" requires_python = ">=3.7" summary = "Internationalization utilities" groups = ["doc"] +dependencies = [ + "pytz>=2015.7; python_version < \"3.9\"", +] files = [ {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"}, {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, @@ -875,6 +882,17 @@ files = [ {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"}, ] +[[package]] +name = "pytz" +version = "2023.3.post1" +summary = "World timezone definitions, modern and historical" +groups = ["doc"] +marker = "python_version < \"3.9\"" +files = [ + {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"}, + {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"}, +] + [[package]] name = "pyyaml" version = "6.0.1" @@ -948,6 +966,7 @@ groups = ["default"] dependencies = [ "markdown-it-py>=2.2.0", "pygments<3.0.0,>=2.13.0", + "typing-extensions<5.0,>=4.0.0; python_version < \"3.9\"", ] files = [ {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"}, From 8be379cb010b5bccd85a3b505986f69c5e276450 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 6 Mar 2024 21:36:05 +0800 Subject: [PATCH 7/7] Revert "ci: set GIT_STRATEGY to none for speicific jobs" This reverts commit d8304dac70b4ce3bae418ea2a119e988db88a184. --- .gitlab/workflows/commitlint.yml | 2 -- .gitlab/workflows/release.yml | 4 ---- .gitlab/workflows/renovate.yml | 1 - .../workflows/devcontainer.yml.jinja | 1 - .../workflows/release.yml.jinja | 1 - 5 files changed, 9 deletions(-) diff --git a/.gitlab/workflows/commitlint.yml b/.gitlab/workflows/commitlint.yml index 7e06471c..4385eb55 100644 --- a/.gitlab/workflows/commitlint.yml +++ b/.gitlab/workflows/commitlint.yml @@ -14,5 +14,3 @@ commitlint: echo "$CI_MERGE_REQUEST_TITLE" | commitlint fi stage: ci - variables: - GIT_STRATEGY: none diff --git a/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml index 8ab95009..7e55ee2a 100644 --- a/.gitlab/workflows/release.yml +++ b/.gitlab/workflows/release.yml @@ -23,8 +23,6 @@ release-publish: script: - echo "Running the release job." stage: release - variables: - GIT_STRATEGY: none container-publish: image: docker:25.0.3@sha256:0d70c541ee98e66b8f7ece8c0e9f7910732466e337a9087c2ac2868ef0775092 needs: @@ -93,5 +91,3 @@ pages: script: - echo "Running the pages job." stage: release - variables: - GIT_STRATEGY: none diff --git a/.gitlab/workflows/renovate.yml b/.gitlab/workflows/renovate.yml index 02470e83..8bc69b5c 100644 --- a/.gitlab/workflows/renovate.yml +++ b/.gitlab/workflows/renovate.yml @@ -9,7 +9,6 @@ renovate: script: renovate $RENOVATE_EXTRA_FLAG stage: build variables: - GIT_STRATEGY: none LOG_LEVEL: debug RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier"]' RENOVATE_BASE_DIR: $CI_PROJECT_DIR/renovate diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja index 05684b02..3b576d57 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja @@ -6,7 +6,6 @@ concurrency: jobs: dev-container-publish: permissions: - contents: read packages: write runs-on: ubuntu-22.04 steps: diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja index 909b222f..75fb63dc 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja @@ -54,7 +54,6 @@ jobs: container-publish: needs: release-publish permissions: - contents: read packages: write runs-on: ubuntu-22.04 steps: