From 91d91614e756c2a30085a8c5efdbc9349b701c73 Mon Sep 17 00:00:00 2001 From: Jac Fitzgerald Date: Fri, 10 Jan 2025 00:17:47 -0800 Subject: [PATCH 1/2] update python version used in actions --- .github/workflows/check-coverage.yml | 4 ++-- .github/workflows/generate-metadata.yml | 4 ++-- .github/workflows/package.yml | 2 +- .github/workflows/publish-pypi.yml | 4 ++-- .github/workflows/python-app.yml | 2 +- .github/workflows/run-e2-tests.yml | 4 ++-- .github/workflows/run-tests.yml | 4 ++-- pyproject.toml | 9 +++++---- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/check-coverage.yml b/.github/workflows/check-coverage.yml index f331880d..7d07dd2a 100644 --- a/.github/workflows/check-coverage.yml +++ b/.github/workflows/check-coverage.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] - python-version: ['3'] + os: [ubuntu-latest] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/generate-metadata.yml b/.github/workflows/generate-metadata.yml index 2e46c5b5..2fe3019c 100644 --- a/.github/workflows/generate-metadata.yml +++ b/.github/workflows/generate-metadata.yml @@ -15,8 +15,8 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 - with: - python-version: '3.9' + with: + python-version: '3.12' - name: Install App and Extras run: | diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 43e59ec5..d596dee1 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -64,7 +64,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install dependencies and build run: | diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index d08307ff..6a9bbe26 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -19,8 +19,8 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-python@v5 - with: - python-version: 3.9 + with: + python-version: 3.12 - name: Build dist files run: | python --version diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 0ecb2183..023a4a7d 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.x'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/run-e2-tests.yml b/.github/workflows/run-e2-tests.yml index 68a8014b..f1e4c547 100644 --- a/.github/workflows/run-e2-tests.yml +++ b/.github/workflows/run-e2-tests.yml @@ -17,8 +17,8 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.9', '3.10', '3.11', '3.12', '3'] + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index fd9a4804..0e3556bc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,8 +14,8 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.9', '3.10', '3.11', '3.12', '3'] + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} diff --git a/pyproject.toml b/pyproject.toml index b1fe6e0a..5cc6d5f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ tabcmd = ["tabcmd.locales/**/*.mo"] [tool.black] line-length = 120 required-version = 22 -target-version = ['py38', 'py39', 'py310', 'py311'] +target-version = ['py39', 'py310', 'py311'] extend-exclude = '^/bin/*' [tool.mypy] disable_error_code = [ @@ -31,14 +31,15 @@ description="A command line client for working with Tableau Server." authors = [{name="Tableau", email="github@tableau.com"}] license = {file = "LICENSE"} readme = "res/README.md" -requires-python = ">=3.7" # https://devguide.python.org/versions/ +requires-python = ">=3.9" # https://devguide.python.org/versions/ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11" + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13" ] dependencies = [ "appdirs", From 34b89acc0bb08f7a49aa87d365f0e1f78306539d Mon Sep 17 00:00:00 2001 From: Jac Fitzgerald Date: Fri, 10 Jan 2025 14:39:37 -0800 Subject: [PATCH 2/2] strip whitespace --- .github/workflows/check-coverage.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/generate-metadata.yml | 2 +- .github/workflows/package.yml | 3 +-- .github/workflows/publish-pypi.yml | 3 +-- .github/workflows/run-e2-tests.yml | 2 +- .github/workflows/run-tests.yml | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check-coverage.yml b/.github/workflows/check-coverage.yml index 7d07dd2a..7d57137f 100644 --- a/.github/workflows/check-coverage.yml +++ b/.github/workflows/check-coverage.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-latest] python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7259097a..0cb6f814 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -48,7 +48,7 @@ jobs: # 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. - + # 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 diff --git a/.github/workflows/generate-metadata.yml b/.github/workflows/generate-metadata.yml index 2fe3019c..53449eb9 100644 --- a/.github/workflows/generate-metadata.yml +++ b/.github/workflows/generate-metadata.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 - with: + with: python-version: '3.12' - name: Install App and Extras diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index d596dee1..d9b65a93 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -94,7 +94,7 @@ jobs: cd dist/${{ matrix.TARGET }} tar -cvf ${{ matrix.UPLOAD_FILE_NAME }} ${{ matrix.OUT_FILE_NAME }} - + - name: Upload binaries to release for ${{ matrix.TARGET }} uses: svenstaro/upload-release-action@v2 with: @@ -104,4 +104,3 @@ jobs: tag: ${{ github.ref_name }} overwrite: true promote: true - diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 6a9bbe26..bc101762 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -19,7 +19,7 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-python@v5 - with: + with: python-version: 3.12 - name: Build dist files run: | @@ -41,4 +41,3 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 with: password: ${{ secrets.PYPI_API_TOKEN }} - diff --git a/.github/workflows/run-e2-tests.yml b/.github/workflows/run-e2-tests.yml index f1e4c547..81ebb4f6 100644 --- a/.github/workflows/run-e2-tests.yml +++ b/.github/workflows/run-e2-tests.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0e3556bc..4e9d279a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }}