From 701bd1047872f57ef18a35eb7da247336114f2b0 Mon Sep 17 00:00:00 2001 From: Spill-Tea Date: Fri, 27 Jun 2025 18:57:31 -0700 Subject: [PATCH 1/7] fix(worklow): Update python-app github config workflow to use upgraded addlicense repo. --- .github/workflows/python-app.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 9d4d723..f0eba0b 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -1,7 +1,4 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python - -name: PyTemplate CI +name: DesignerDNA CI on: push: @@ -16,7 +13,7 @@ jobs: fail-fast: false steps: - - name: Checkout PyTemplate Project + - name: Checkout DesignerDNA Project uses: actions/checkout@v4 - name: Set up Python @@ -48,7 +45,7 @@ jobs: python-version: [ "3.11", "3.12" ] steps: - - name: Checkout PyTemplate Project + - name: Checkout DesignerDNA Project uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -120,7 +117,7 @@ jobs: - name: Install addlicense run: | - go install github.com/google/addlicense@v1.1.1 + go install https://github.com/Spill-Tea/addlicense-pre-commit@v1.1.3 - name: Check for License Headers run: | From 1c7b126ac105173d7e4c0a0877249886fcb575dc Mon Sep 17 00:00:00 2001 From: Spill-Tea Date: Fri, 27 Jun 2025 18:59:23 -0700 Subject: [PATCH 2/7] fix(ci): fix url path for go install. --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index f0eba0b..6800c7b 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -117,7 +117,7 @@ jobs: - name: Install addlicense run: | - go install https://github.com/Spill-Tea/addlicense-pre-commit@v1.1.3 + go install github.com/Spill-Tea/addlicense-pre-commit@v1.1.3 - name: Check for License Headers run: | From a9289cbfcea052664862a5767879bc891eae3945 Mon Sep 17 00:00:00 2001 From: Spill-Tea Date: Fri, 27 Jun 2025 22:47:14 -0700 Subject: [PATCH 3/7] test if main works. --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 6800c7b..98c11a5 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -117,7 +117,7 @@ jobs: - name: Install addlicense run: | - go install github.com/Spill-Tea/addlicense-pre-commit@v1.1.3 + go install github.com/Spill-Tea/addlicense-pre-commit@main - name: Check for License Headers run: | From 104cc47d96e7f0a71ea20691383ad4ab1f8bada3 Mon Sep 17 00:00:00 2001 From: Spill-Tea Date: Fri, 27 Jun 2025 22:52:52 -0700 Subject: [PATCH 4/7] try updated tag. --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 98c11a5..2d70748 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -117,7 +117,7 @@ jobs: - name: Install addlicense run: | - go install github.com/Spill-Tea/addlicense-pre-commit@main + go install github.com/Spill-Tea/addlicense-pre-commit@v1.1.4 - name: Check for License Headers run: | From 510f99d3f5c6c7b986f02e5fd0a765c3188bdefa Mon Sep 17 00:00:00 2001 From: Spill-Tea Date: Sat, 28 Jun 2025 16:01:06 -0700 Subject: [PATCH 5/7] chore(license): update license format in a few files in repo. --- src/designer_dna/_oligos.pyx | 12 ++++++------ src/designer_dna/headers/common.pxd | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/designer_dna/_oligos.pyx b/src/designer_dna/_oligos.pyx index 13c0786..57d7c87 100644 --- a/src/designer_dna/_oligos.pyx +++ b/src/designer_dna/_oligos.pyx @@ -1,21 +1,21 @@ # BSD 3-Clause License - +# # Copyright (c) 2025, Spill-Tea - +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: - +# # 1. Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. - +# # 2. Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. - +# # 3. Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. - +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/src/designer_dna/headers/common.pxd b/src/designer_dna/headers/common.pxd index ed3581e..9fb0ed9 100644 --- a/src/designer_dna/headers/common.pxd +++ b/src/designer_dna/headers/common.pxd @@ -1,21 +1,21 @@ # BSD 3-Clause License - +# # Copyright (c) 2025, Spill-Tea - +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: - +# # 1. Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. - +# # 2. Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. - +# # 3. Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. - +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE From 9cc422ee16fc957b7bb39da7f80cbac9b70d87ca Mon Sep 17 00:00:00 2001 From: Spill-Tea Date: Sat, 28 Jun 2025 17:43:21 -0700 Subject: [PATCH 6/7] Correct addlicense versions. --- .github/workflows/python-app.yml | 2 +- .pre-commit-config.yaml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 2d70748..6800c7b 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -117,7 +117,7 @@ jobs: - name: Install addlicense run: | - go install github.com/Spill-Tea/addlicense-pre-commit@v1.1.4 + go install github.com/Spill-Tea/addlicense-pre-commit@v1.1.3 - name: Check for License Headers run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 084909c..9ed79d6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,5 @@ repos: - id: addlicense language: golang exclude: ^docs/ - args: [ - -f, LICENSE, - ] + args: [ -f, LICENSE ] types_or: [ python, cython, c ] From 7cf313af6e6a8df3f9ff935cc95c223430fcd01e Mon Sep 17 00:00:00 2001 From: Spill-Tea Date: Thu, 3 Jul 2025 16:34:34 -0700 Subject: [PATCH 7/7] fix(workflow): Current workaround to using updated tools for cython file support. --- .github/workflows/python-app.yml | 6 +++--- .pre-commit-config.yaml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 6800c7b..3f76adc 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -117,9 +117,9 @@ jobs: - name: Install addlicense run: | - go install github.com/Spill-Tea/addlicense-pre-commit@v1.1.3 + go install github.com/Spill-Tea/addlicense-pre-commit@v1.2.0 - name: Check for License Headers run: | - addlicense -check -f LICENSE src - addlicense -check -f LICENSE tests + addlicense-pre-commit -check -f LICENSE src + addlicense-pre-commit -check -f LICENSE tests diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9ed79d6..547e44a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,9 +14,10 @@ repos: - id: requirements-txt-fixer - repo: https://github.com/Spill-Tea/addlicense-pre-commit - rev: v1.1.3 + rev: v1.2.0 hooks: - id: addlicense + entry: addlicense-pre-commit language: golang exclude: ^docs/ args: [ -f, LICENSE ]