Pins ubuntu versions to ubuntu-20.04 for any task needing Python 2.7.

LianaHarris360 · Jan 9, 2023 · fd9705a · fd9705a
1 parent 60af49c
commit fd9705a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/c_extensions.yml b/.github/workflows/c_extensions.yml
@@ -27,7 +27,7 @@ jobs:
     name: C Extensions
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
@@ -65,7 +65,7 @@ jobs:
     name: No C Extensions
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2

diff --git a/.github/workflows/no_zombies.yml b/.github/workflows/no_zombies.yml
@@ -32,7 +32,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: '3.11'
     - name: pip cache
       uses: actions/cache@v2
       with:

diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   postgres:
     name: Python postgres unit tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       max-parallel: 5
       matrix:
@@ -33,18 +33,18 @@ jobs:
           - 5432:5432
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.6 for Postgres
+    - name: Set up Python 3.9 for Postgres
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.9
     - name: Install tox
       run: |
         python -m pip install --upgrade pip
         pip install tox
     - name: tox env cache
       uses: actions/cache@v2
       with:
-        path: ${{ github.workspace }}/.tox/py3.6
-        key: ${{ runner.os }}-tox-py3.6-${{ hashFiles('requirements/*.txt') }}
+        path: ${{ github.workspace }}/.tox/py3.9
+        key: ${{ runner.os }}-tox-py3.9-${{ hashFiles('requirements/*.txt') }}
     - name: Test with tox
       run: tox -e postgres
diff --git a/.github/workflows/python2lint.yml b/.github/workflows/python2lint.yml
@@ -27,7 +27,7 @@ jobs:
     name: Python 2 syntax checking
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 2.7

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -26,7 +26,7 @@ jobs:
   unit_test:
     name: Python unit tests
     needs: pre_job
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       max-parallel: 5
       matrix:
@@ -78,11 +78,11 @@ jobs:
           - 5432:5432
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.6 for Postgres
+    - name: Set up Python 3.9 for Postgres
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.9
     - name: Install tox
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
       run: |
@@ -92,8 +92,8 @@ jobs:
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
       uses: actions/cache@v2
       with:
-        path: ${{ github.workspace }}/.tox/py3.6
-        key: ${{ runner.os }}-tox-py3.6-${{ hashFiles('requirements/*.txt') }}
+        path: ${{ github.workspace }}/.tox/py3.9
+        key: ${{ runner.os }}-tox-py3.9-${{ hashFiles('requirements/*.txt') }}
     - name: Test with tox
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
       run: tox -e postgres

diff --git a/tox.ini b/tox.ini
@@ -48,7 +48,7 @@ setenv =
     KOLIBRI_DATABASE_PORT = 5432
     KOLIBRI_RUN_MODE = tox
 basepython =
-    postgres: python3.6
+    postgres: python3.9
 deps =
     -r{toxinidir}/requirements/test.txt
     -r{toxinidir}/requirements/base.txt