From 51e82f7d2472551aa82d0f53752fdd537717cd60 Mon Sep 17 00:00:00 2001 From: Harmon Date: Wed, 2 Aug 2023 21:28:43 -0500 Subject: [PATCH] [GitHub Actions] Use pyproject.toml to specify Python version --- .github/workflows/platforms.yml | 14 ++++---------- .github/workflows/tests.yml | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/platforms.yml b/.github/workflows/platforms.yml index 6d55438716..1f17b71910 100644 --- a/.github/workflows/platforms.yml +++ b/.github/workflows/platforms.yml @@ -13,9 +13,6 @@ jobs: os: [ubuntu-latest] # Container action (for PostgreSQL) is only supported on Linux postgresql-version: ['12.1'] - python-version: ['3.10.10'] - # python-version: ['3.11.0-rc.2'] - # continue-on-error: ${{ matrix.python-version == '3.11.0-rc.2' }} runs-on: ${{ matrix.os }} steps: @@ -27,10 +24,10 @@ jobs: postgresql db: harmonbot postgresql user: harmonbot postgresql password: "" - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v4.7.0 with: - python-version: ${{ matrix.python-version }} + python-version-file: pyproject.toml architecture: x64 - name: Cache pip uses: actions/cache@v3.3.1 @@ -58,17 +55,14 @@ jobs: max-parallel: 1 matrix: os: [macOS-latest, ubuntu-latest, windows-latest] - python-version: ['3.10.10'] - # python-version: ['3.11.0-rc.2'] - # continue-on-error: ${{ matrix.python-version == '3.11.0-rc.2' }} runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3.5.3 - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v4.7.0 with: - python-version: ${{ matrix.python-version }} + python-version-file: pyproject.toml architecture: x64 - uses: actions/cache@v3.3.1 if: startsWith(runner.os, 'Linux') diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6668fca100..72d9ed0f47 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4.7.0 with: - python-version: '3.10.10' + python-version-file: pyproject.toml architecture: x64 - name: Cache pip uses: actions/cache@v3.3.1 @@ -35,7 +35,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4.7.0 with: - python-version: '3.10.10' + python-version-file: pyproject.toml architecture: x64 - name: Cache pip uses: actions/cache@v3.3.1