From a0b05f73e92a1f80997fb22009acb71b6e497442 Mon Sep 17 00:00:00 2001 From: Ivana Kellyerova Date: Mon, 19 Jun 2023 18:36:25 +0200 Subject: [PATCH] ??? --- .github/workflows/test-common.yml | 4 ---- .github/workflows/test-integration-boto3.yml | 4 ---- .github/workflows/test-integration-bottle.yml | 4 ---- .github/workflows/test-integration-celery.yml | 4 ---- .github/workflows/test-integration-django.yml | 4 ---- .github/workflows/test-integration-falcon.yml | 4 ---- .github/workflows/test-integration-flask.yml | 4 ---- .github/workflows/test-integration-gevent.yml | 4 ---- .github/workflows/test-integration-huey.yml | 4 ---- .github/workflows/test-integration-pymongo.yml | 4 ---- .github/workflows/test-integration-pyramid.yml | 4 ---- .github/workflows/test-integration-redis.yml | 4 ---- .github/workflows/test-integration-rediscluster.yml | 4 ---- .github/workflows/test-integration-requests.yml | 4 ---- .github/workflows/test-integration-rq.yml | 4 ---- .github/workflows/test-integration-sqlalchemy.yml | 4 ---- scripts/split-tox-gh-actions/split-tox-gh-actions.py | 4 ++-- 17 files changed, 2 insertions(+), 66 deletions(-) diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml index 55ad8a85d9..46aec35dd4 100644 --- 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 index 7767d7d2b7..0c6cd55e9e 100644 --- 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 index f173b63511..b8c7561a2d 100644 --- 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 index c88ad01d07..21a4747d83 100644 --- 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 index ca96a9374c..dbd032d6dc 100644 --- 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 index 2b9ad8ee2e..edabecbe11 100644 --- 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 index da6d594367..373e86c10d 100644 --- 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 index 282a700ca2..40acbce266 100644 --- 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 index 8ae05351b3..22fda63543 100644 --- 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 index b1d486261e..d5b2743a67 100644 --- 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 index 11d1ef3eda..bb57639c9c 100644 --- 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 index 9b757afd44..79998aaf6b 100644 --- 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 index 249abcaced..94fe58b12a 100644 --- 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 index 3cd87dfe89..321813d08e 100644 --- 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 index 4388b2935b..f12a9ed067 100644 --- 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 index 50c82e3270..7208e67abd 100644 --- 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 index 4eedb47c54..914b7d0dea 100755 --- 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)