From fb8c1640178a6a91399d47eaa92c2d918e043aa1 Mon Sep 17 00:00:00 2001 From: Kyle King Date: Tue, 21 Nov 2023 08:46:26 -0500 Subject: [PATCH] build: copier-auto-update --- .copier-answers.yml | 2 +- .github/actions/setup/action.yml | 29 ++------------- .github/codeql-config.yml | 16 --------- .github/workflows/ci_pipeline.yml | 4 +-- .github/workflows/codeql-analysis.yml | 52 --------------------------- .github/workflows/labeler.yml | 2 +- .github/workflows/update_docs.yml | 5 +-- .pre-commit-config.yaml | 8 ++--- .tool-versions | 2 +- 9 files changed, 12 insertions(+), 108 deletions(-) delete mode 100644 .github/codeql-config.yml delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.copier-answers.yml b/.copier-answers.yml index cc72dd90..dc11085f 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -2,7 +2,7 @@ # Answer file maintained by Copier for: https://github.com/KyleKing/calcipy_template # DO NOT MODIFY THIS FILE. Edit by re-running copier and changing responses to the questions # Check into version control. -_commit: 1.9.1 +_commit: 1.9.3 _src_path: gh:KyleKing/calcipy_template author_email: dev.act.kyle@gmail.com author_name: Kyle King diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 12ed0e9e..a1d69dd6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -4,11 +4,11 @@ description: Install requested pipx dependencies, configure the system python, a inputs: os: - default: ubuntu-22.04 + default: ubuntu-latest pipx-packages: default: "" poetry-version: - default: 1.6.1 + default: 1.7.1 python-version: required: true @@ -19,36 +19,11 @@ env: runs: using: composite steps: - - name: Setup Local Variables - id: variable-setup - run: | - echo "pipx-home=$PIPX_HOME" >> $GITHUB_OUTPUT - echo "pipx-bin-dir=$PIPX_BIN_DIR" >> $GITHUB_OUTPUT - - export BASE64_PIPX_ID=$(echo -n 'poetry==${{ inputs.poetry-version }} ${{ inputs.pipx-packages }}' | base64) - echo "cache-key-pipx=pipx-${{ inputs.os }}-${{ inputs.python-version }}-$BASE64_PIPX_ID" >> $GITHUB_OUTPUT - shell: bash - - - name: Cache pipx - id: cache-pipx - # cache doesn't have permission to extract to "opt/" - if: ${{ inputs.os != 'macos-latest' }} - uses: actions/cache@v3 - with: - # https://pypa.github.io/pipx/how-pipx-works - path: | - ${{ steps.variable-setup.outputs.pipx-home }} - ${{ steps.variable-setup.outputs.pipx-bin-dir }} - key: ${{ steps.variable-setup.outputs.cache-key-pipx }} - - name: Install Poetry ${{ inputs.poetry-version }} and '${{ inputs.pipx-packages }}' - if: ${{ steps.cache-pipx.outputs.cache-hit != 'true' }} run: | for tool in "poetry==${{ inputs.poetry-version }}" ${{ inputs.pipx-packages }}; do pipx install $tool done - # Resolves https://github.com/python-poetry/poetry/issues/7611 - poetry self add setuptools==68.1.2 shell: bash - name: Debug pipx diff --git a/.github/codeql-config.yml b/.github/codeql-config.yml deleted file mode 100644 index 029b4de4..00000000 --- a/.github/codeql-config.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: Python CodeQL Configuration - -# If you wish to specify custom queries, you can do so here or in a config file. -# By default, queries listed here will override any specified in a config file. -# Prefix the list here with "+" to use these queries and those in the config file. - -# Exclude errors already caught by pylint/flake8 -# https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#excluding-specific-queries-from-analysis -query-filters: - - exclude: - id: js/redundant-assignment - - exclude: - id: js/useless-assignment-to-local - - exclude: - id: py/unused-import diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index a569c313..9b756464 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] python-version: ["3.9"] steps: - uses: actions/checkout@v4 @@ -52,7 +52,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] python-version: ["3.9"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 5c274990..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -# Based on the GitHub-recommended CodeQL Action -name: CodeQL - -"on": - push: - branches: [main] - pull_request: - branches: [main] - schedule: - - cron: 34 21 * * 6 - workflow_dispatch: null # For manual runs - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-22.04 - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - python-version: ["3.9"] - language: [python] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup - with: - os: ubuntu-latest - python-version: ${{ matrix.python-version }} - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - config-file: .github/codeql-config.yml - languages: ${{ matrix.language }} - setup-python-dependencies: false - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - queries: security-extended,security-and-quality - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: /language:${{ matrix.language }} diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 112e1811..a88ea550 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -18,8 +18,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Run Labeler - if: success() uses: crazy-max/ghaction-github-labeler@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/update_docs.yml b/.github/workflows/update_docs.yml index 93c947f8..9bebe40f 100644 --- a/.github/workflows/update_docs.yml +++ b/.github/workflows/update_docs.yml @@ -14,15 +14,12 @@ permissions: # Repository contents, commits, branches, downloads, releases, and merges. contents: write -env: - COLUMNS: 120 - jobs: docs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] python-version: ["3.9"] steps: - uses: actions/checkout@v4 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 774deb48..81a5f036 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,17 +58,17 @@ repos: - id: shellcheck args: [--severity=warning] - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.3" + rev: "v3.1.0" hooks: - id: prettier additional_dependencies: # Note: this version must be the same as the hook revision - - "prettier@3.0.3" + - "prettier@3.1.0" - "prettier-plugin-sh" exclude: \.copier-answers\.yml|tests/.*/cassettes/.*\.yaml types_or: [html, javascript, json, shell, yaml] - repo: https://github.com/adrienverge/yamllint.git - rev: v1.32.0 + rev: v1.33.0 hooks: - id: yamllint exclude: tests/.*/cassettes/.*\.yaml @@ -91,7 +91,7 @@ repos: args: [--never] files: calcipy/.*\.py - repo: https://github.com/KyleKing/calcipy - rev: 2.0.1 + rev: 2.0.2 hooks: - id: copier-forbidden-files - id: lint-fix diff --git a/.tool-versions b/.tool-versions index 0675ff92..ca378dfd 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -python 3.11.2 3.9.13 +python 3.12.0 3.9.13