From 5714f22404b2fef1ef806ea9d8ed139ea577d321 Mon Sep 17 00:00:00 2001 From: qiuz-cz Date: Mon, 3 Aug 2026 22:38:05 -0400 Subject: [PATCH] Align headers and license metadata with govern-opensource standard - Replace proprietary/confidential file headers with the standard two-line SPDX Apache-2.0 header in all Python and JS/TS sources. An open-source template must not stamp PROPRIETARY AND CONFIDENTIAL notices into every project created from it. - Fix FILE-HEADER: stray comma in 'Copyright (c),' and align to the standard header text. - pyproject.toml: PEP 639 SPDX string form (license = "Apache-2.0"), setuptools>=77 (required for PEP 639), drop the deprecated License :: classifier. Surfaced during the CTO-1890 OSS release review; matches cz-standards PR #68 and the updated Open Source at CloudZero Confluence page. Commit Generated with AI Co-Authored-By: AI --- FILE-HEADER | 4 ++-- javascript/eslint.config.mjs | 9 ++------- javascript/jest.config.js | 9 ++------- javascript/src/index.ts | 9 ++------- javascript/tests/index.test.ts | 9 ++------- python/pyproject.toml | 5 ++--- python/src/__init__.py | 7 ++----- python/tests/__init__.py | 7 ++----- python/tests/test_example.py | 7 ++----- 9 files changed, 18 insertions(+), 48 deletions(-) diff --git a/FILE-HEADER b/FILE-HEADER index e69376b..9baffa0 100644 --- a/FILE-HEADER +++ b/FILE-HEADER @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: Copyright (c), CloudZero, Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 +# SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 diff --git a/javascript/eslint.config.mjs b/javascript/eslint.config.mjs index babd6b0..77120e6 100644 --- a/javascript/eslint.config.mjs +++ b/javascript/eslint.config.mjs @@ -1,10 +1,5 @@ -/** - * Copyright (c) CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL - * Unauthorized copying of this file and/or project, via any medium is strictly prohibited. - * Direct all questions to legal@cloudzero.com - * - * CHANGELOG: 2025-11-17 - Initial creation (erik.peterson) - */ +// SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 import eslint from "@eslint/js"; import tseslint from "typescript-eslint"; diff --git a/javascript/jest.config.js b/javascript/jest.config.js index 05cd85a..9546efc 100644 --- a/javascript/jest.config.js +++ b/javascript/jest.config.js @@ -1,10 +1,5 @@ -/** - * Copyright (c) CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL - * Unauthorized copying of this file and/or project, via any medium is strictly prohibited. - * Direct all questions to legal@cloudzero.com - * - * CHANGELOG: 2025-11-17 - Initial creation (erik.peterson) - */ +// SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 module.exports = { preset: "ts-jest", diff --git a/javascript/src/index.ts b/javascript/src/index.ts index f5189e7..3b0eaa1 100644 --- a/javascript/src/index.ts +++ b/javascript/src/index.ts @@ -1,10 +1,5 @@ -/** - * Copyright (c) CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL - * Unauthorized copying of this file and/or project, via any medium is strictly prohibited. - * Direct all questions to legal@cloudzero.com - * - * CHANGELOG: 2025-11-17 - Initial creation (erik.peterson) - */ +// SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 /** * CloudZero TypeScript Template Package diff --git a/javascript/tests/index.test.ts b/javascript/tests/index.test.ts index 89bde33..12610d4 100644 --- a/javascript/tests/index.test.ts +++ b/javascript/tests/index.test.ts @@ -1,10 +1,5 @@ -/** - * Copyright (c) CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL - * Unauthorized copying of this file and/or project, via any medium is strictly prohibited. - * Direct all questions to legal@cloudzero.com - * - * CHANGELOG: 2025-11-17 - Initial creation (erik.peterson) - */ +// SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 import { greet, VERSION } from "../src/index"; diff --git a/python/pyproject.toml b/python/pyproject.toml index dafe811..de1f271 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=61.0", "wheel"] +requires = ["setuptools>=77.0", "wheel"] build-backend = "setuptools.build_meta" [project] @@ -8,7 +8,7 @@ dynamic = ["version"] description = "CloudZero Open Source Template" readme = "README.md" requires-python = ">=3.11" -license = {text = "Apache-2.0"} +license = "Apache-2.0" authors = [ { name = "CloudZero", email = "support@cloudzero.com" }, ] @@ -18,7 +18,6 @@ keywords = [ classifiers = [ "Development Status :: 4 - Beta", "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", "Natural Language :: English", "Operating System :: MacOS", "Operating System :: Unix", diff --git a/python/src/__init__.py b/python/src/__init__.py index e979a2a..c464a62 100644 --- a/python/src/__init__.py +++ b/python/src/__init__.py @@ -1,8 +1,5 @@ -# Copyright (c) CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL -# Unauthorized copying of this file and/or project, via any medium is strictly prohibited. -# Direct all questions to legal@cloudzero.com -# -# CHANGELOG: 2025-11-17 - Initial creation (erik.peterson) +# SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 """ CloudZero Python Template Package. diff --git a/python/tests/__init__.py b/python/tests/__init__.py index dd94ec9..6ed53c2 100644 --- a/python/tests/__init__.py +++ b/python/tests/__init__.py @@ -1,7 +1,4 @@ -# Copyright (c) CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL -# Unauthorized copying of this file and/or project, via any medium is strictly prohibited. -# Direct all questions to legal@cloudzero.com -# -# CHANGELOG: 2025-11-17 - Initial creation (erik.peterson) +# SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 """Tests for CloudZero Python Template Package.""" diff --git a/python/tests/test_example.py b/python/tests/test_example.py index 5ceb576..d37a1b1 100644 --- a/python/tests/test_example.py +++ b/python/tests/test_example.py @@ -1,8 +1,5 @@ -# Copyright (c) CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL -# Unauthorized copying of this file and/or project, via any medium is strictly prohibited. -# Direct all questions to legal@cloudzero.com -# -# CHANGELOG: 2025-11-17 - Initial creation (erik.peterson) +# SPDX-FileCopyrightText: Copyright (c) CloudZero, Inc. or its affiliates. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 """Example test file for demonstrating pytest setup."""