From 86c522a45e8af0f3660763aa62dce1db7e51d549 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Fri, 31 Jan 2025 01:58:25 +0000 Subject: [PATCH 1/3] chore: unifiy platform related classifiers --- .github/workflows/delete-untagged-packages.yml | 2 +- copier.yaml | 4 ++-- includes/copier-answers-sample.yml | 2 +- template/pyproject.toml.jinja | 10 +++++++++- .../workflows/ci.yml.jinja | 2 +- .../workflows/delete-untagged-packages.yml.jinja | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/delete-untagged-packages.yml b/.github/workflows/delete-untagged-packages.yml index 42e9fd5a..cdf0cb18 100644 --- a/.github/workflows/delete-untagged-packages.yml +++ b/.github/workflows/delete-untagged-packages.yml @@ -10,7 +10,7 @@ permissions: jobs: delete-untagged-packages: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Delete untagged dev-cache packages uses: actions/delete-package-versions@e5bc658cc4c965c472efe991f8beea3981499c55 # v5.0.0 diff --git a/copier.yaml b/copier.yaml index 40cdacf1..3933d8b9 100644 --- a/copier.yaml +++ b/copier.yaml @@ -127,10 +127,10 @@ coverage_threshold: type: int validator: "{% if not 0 <= coverage_threshold <= 100 %}Test Coverage threshold should be between 0 and 100{% endif %}" platforms: - default: ["macos", "ubuntu", "windows"] + default: ["macos", "linux", "windows"] choices: - macos - - ubuntu + - linux - windows help: "Set the supported platforms for the project:" multiselect: true diff --git a/includes/copier-answers-sample.yml b/includes/copier-answers-sample.yml index 5defe9c2..3ad46a4a 100644 --- a/includes/copier-answers-sample.yml +++ b/includes/copier-answers-sample.yml @@ -13,7 +13,7 @@ organization_name: Serious Scaffold package_name: ss-python platforms: - macos - - ubuntu + - linux - windows project_description: A Python Project Template for Long-Term Maintainability. diff --git a/template/pyproject.toml.jinja b/template/pyproject.toml.jinja index 7366a990..56ae5403 100644 --- a/template/pyproject.toml.jinja +++ b/template/pyproject.toml.jinja @@ -48,7 +48,15 @@ classifiers = [ "Development Status :: 5 - Production/Stable", {% endif %} "License :: OSI Approved :: {{ copyright_license }}", - "Operating System :: OS Independent", +{% if "macos" in platforms %} + "Operating System :: MacOS :: MacOS X", +{% endif %} +{% if "linux" in platforms %} + "Operating System :: POSIX :: Linux", +{% endif %} +{% if "windows" in platforms %} + "Operating System :: Microsoft :: Windows", +{% endif %} "Programming Language :: Python :: 3 :: Only", {% if version_between("3.9", min_py, max_py) %} "Programming Language :: Python :: 3.9", diff --git a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja index 7317698d..5dbf2293 100644 --- a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja +++ b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja @@ -40,7 +40,7 @@ jobs: # renovate: github-runner - macos-14 {% endif %} -{% if "ubuntu" in platforms %} +{% if "linux" in platforms %} # renovate: github-runner - ubuntu-24.04 {% endif %} diff --git a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja index 6b077fb8..20c74845 100644 --- a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja +++ b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja @@ -10,7 +10,7 @@ permissions: jobs: delete-untagged-packages: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Delete untagged dev-cache packages uses: actions/delete-package-versions@e5bc658cc4c965c472efe991f8beea3981499c55 # v5.0.0 From 0f74c34d976370dc14925a7bc1a9e19e01d05d54 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Fri, 31 Jan 2025 01:59:08 +0000 Subject: [PATCH 2/3] update pyproject.toml --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a3546181..d26405ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,9 @@ requires-python = ">=3.9" classifiers = [ "Development Status :: 3 - Alpha", "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", + "Operating System :: MacOS :: MacOS X", + "Operating System :: POSIX :: Linux", + "Operating System :: Microsoft :: Windows", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", From 05c0c2e2f23d5a34f7779d5ebb5c890e2fffff2b Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Fri, 31 Jan 2025 02:00:12 +0000 Subject: [PATCH 3/3] reorder --- pyproject.toml | 2 +- template/pyproject.toml.jinja | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d26405ba..662ab0f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,8 +24,8 @@ classifiers = [ "Development Status :: 3 - Alpha", "License :: OSI Approved :: MIT License", "Operating System :: MacOS :: MacOS X", - "Operating System :: POSIX :: Linux", "Operating System :: Microsoft :: Windows", + "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/template/pyproject.toml.jinja b/template/pyproject.toml.jinja index 56ae5403..6e93909f 100644 --- a/template/pyproject.toml.jinja +++ b/template/pyproject.toml.jinja @@ -51,11 +51,11 @@ classifiers = [ {% if "macos" in platforms %} "Operating System :: MacOS :: MacOS X", {% endif %} -{% if "linux" in platforms %} - "Operating System :: POSIX :: Linux", -{% endif %} {% if "windows" in platforms %} "Operating System :: Microsoft :: Windows", +{% endif %} +{% if "linux" in platforms %} + "Operating System :: POSIX :: Linux", {% endif %} "Programming Language :: Python :: 3 :: Only", {% if version_between("3.9", min_py, max_py) %}