???

getsentry · Jun 19, 2023 · a0b05f7 · a0b05f7
1 parent cdf3fc2
commit a0b05f7
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 66 deletions.
diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml
@@ -27,8 +27,6 @@ jobs:
     name: common, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-boto3.yml b/.github/workflows/test-integration-boto3.yml
@@ -27,8 +27,6 @@ jobs:
     name: boto3, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
@@ -27,8 +27,6 @@ jobs:
     name: bottle, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-celery.yml b/.github/workflows/test-integration-celery.yml
@@ -27,8 +27,6 @@ jobs:
     name: celery, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
@@ -27,8 +27,6 @@ jobs:
     name: django, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -95,8 +93,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
@@ -27,8 +27,6 @@ jobs:
     name: falcon, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
@@ -27,8 +27,6 @@ jobs:
     name: flask, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-gevent.yml b/.github/workflows/test-integration-gevent.yml
@@ -27,8 +27,6 @@ jobs:
     name: gevent, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-huey.yml b/.github/workflows/test-integration-huey.yml
@@ -27,8 +27,6 @@ jobs:
     name: huey, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-pymongo.yml b/.github/workflows/test-integration-pymongo.yml
@@ -27,8 +27,6 @@ jobs:
     name: pymongo, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
@@ -27,8 +27,6 @@ jobs:
     name: pyramid, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-redis.yml b/.github/workflows/test-integration-redis.yml
@@ -27,8 +27,6 @@ jobs:
     name: redis, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-rediscluster.yml b/.github/workflows/test-integration-rediscluster.yml
@@ -27,8 +27,6 @@ jobs:
     name: rediscluster, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-requests.yml b/.github/workflows/test-integration-requests.yml
@@ -27,8 +27,6 @@ jobs:
     name: requests, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
@@ -27,8 +27,6 @@ jobs:
     name: rq, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
@@ -27,8 +27,6 @@ jobs:
     name: sqlalchemy, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
-    container:
-      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -77,8 +75,6 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
-    container:
-      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/scripts/split-tox-gh-actions/split-tox-gh-actions.py b/scripts/split-tox-gh-actions/split-tox-gh-actions.py
@@ -74,9 +74,9 @@ def write_yaml_file(
                 f.close()
 
         elif template_line == "{{ docker_image }}\n":
-            print(py_versions)
             if "2.7" in py_versions:
-                out += DOCKER_IMAGE_FOR_27
+                if False:
+                    out += DOCKER_IMAGE_FOR_27
 
         else:
             out += template_line.replace("{{ framework }}", current_framework)