From 9326bd5889e2a72f88cd06ef52842e2dc73c1c09 Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Tue, 13 Feb 2024 14:54:04 -0500 Subject: [PATCH] chore: Update python to 3.12 wherever possible --- .github/workflows/bump-version.yaml | 4 ++-- .github/workflows/integration-test.yml | 6 +++--- .github/workflows/pull-translations.yaml | 2 +- .github/workflows/release.yaml | 12 ++++++------ .github/workflows/test.yml | 2 +- setup.py | 3 ++- tutoraspects/commands_v0.py | 2 +- .../templates/aspects/build/aspects/Dockerfile | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/bump-version.yaml b/.github/workflows/bump-version.yaml index 50e33eb11..567380e70 100644 --- a/.github/workflows/bump-version.yaml +++ b/.github/workflows/bump-version.yaml @@ -24,10 +24,10 @@ jobs: default_bump: false default_prerelease_bump: false dry_run: true - - name: Set up Python 3.8 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.12" - name: Create bumpversion if: steps.tag_version.outputs.new_version run: | diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index c185d7801..bb2938ed9 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -24,7 +24,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install python reqs run: pip install -r requirements/dev.txt - name: Install aspects @@ -78,7 +78,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install python reqs run: pip install -r requirements/dev.txt - name: Install aspects @@ -130,7 +130,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Generate env run: | pip install -r requirements/dev.txt diff --git a/.github/workflows/pull-translations.yaml b/.github/workflows/pull-translations.yaml index 2cb42924e..968f3cfb2 100644 --- a/.github/workflows/pull-translations.yaml +++ b/.github/workflows/pull-translations.yaml @@ -16,7 +16,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install aspects run: pip install . - name: Install requirements diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7bcfa4033..ef48812d1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -36,7 +36,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Install pip run: pip install -r requirements/pip.txt - name: Build package @@ -60,7 +60,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install aspects run: pip install . - name: Save config @@ -85,7 +85,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install aspects run: pip install . - name: Save config @@ -110,7 +110,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install aspects run: pip install . - name: Save config @@ -121,7 +121,7 @@ jobs: run: | tutor images build openedx --cache-to-registry tutor images push openedx - + build-openedx-dev: runs-on: ubuntu-latest needs: release @@ -136,7 +136,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install aspects run: pip install . - name: Save config diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ccc65e45f..229e67c6b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Install development dependencies run: make dev-requirements diff --git a/setup.py b/setup.py index 0bf00dca6..548d12313 100644 --- a/setup.py +++ b/setup.py @@ -53,9 +53,10 @@ def load_about(): "License :: OSI Approved :: GNU Affero General Public License v3", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], ) diff --git a/tutoraspects/commands_v0.py b/tutoraspects/commands_v0.py index 467165520..930ed937e 100644 --- a/tutoraspects/commands_v0.py +++ b/tutoraspects/commands_v0.py @@ -32,7 +32,7 @@ def dbt(context, command) -> None: runner = context.job_runner(config) command = f"""echo 'Making dbt script executable...' - echo 'Running dbt {command}' + echo 'Running dbt {command}' bash /app/aspects/scripts/dbt.sh {command} echo 'Done!'; """ diff --git a/tutoraspects/templates/aspects/build/aspects/Dockerfile b/tutoraspects/templates/aspects/build/aspects/Dockerfile index 96a98ca4f..bf8996c38 100644 --- a/tutoraspects/templates/aspects/build/aspects/Dockerfile +++ b/tutoraspects/templates/aspects/build/aspects/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8 +FROM python:3.12 WORKDIR /app