remove python2 from workflows

Change-Id: Ib2da811acbad291dc9bbe798c84f2309f5d0f21e

diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml
index 6dbfcfa8dc7ee2be8b10ddf1b660fa46dfa87c04..e90a9f3a2e3c78c1ad13a5fddc1e73e2565ea593 100644 (file)
--- a/.github/workflows/create-wheels.yaml
+++ b/.github/workflows/create-wheels.yaml
@@ -23,8 +23,6 @@ jobs:
           - "windows-latest"
           - "macos-latest"
         python-version:
-          - "2.7"
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
@@ -33,10 +31,6 @@ jobs:
           - x64
           - x86
 
-        include:
-          - python-version: "2.7"
-            extra-requires: "mock"
-
         exclude:
           - os: "macos-latest"
             architecture: x86
@@ -103,12 +97,6 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           files: 'dist/*.whl'
 
-      - name: Set up Python for twine
-        # twine on py2 is very old and is no longer updated, so we change to python 3.8 before upload
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.8"
-
       - name: Publish wheel
         # the action https://github.com/marketplace/actions/pypi-publish runs only on linux and we cannot specify
         # additional options
@@ -130,9 +118,6 @@ jobs:
           - "ubuntu-latest"
         python-version:
           # the versions are <python tag>-<abi tag> as specified in PEP 425.
-          - cp27-cp27m
-          - cp27-cp27mu
-          - cp36-cp36m
           - cp37-cp37m
           - cp38-cp38
           - cp39-cp39
@@ -140,12 +125,6 @@ jobs:
         architecture:
           - x64
 
-        include:
-          - python-version: "cp27-cp27m"
-            extra-requires: "mock"
-          - python-version: "cp27-cp27mu"
-            extra-requires: "mock"
-
       fail-fast: false
 
     steps:
@@ -177,7 +156,6 @@ jobs:
           (cat setup.cfg) | %{$_ -replace "tag_build.?=.?dev",""} | set-content setup.cfg
 
       - name: Create wheel for manylinux1 and manylinux2010 for py3
-        if: ${{ matrix.python-version != 'cp27-cp27m' && matrix.python-version != 'cp27-cp27mu' }}
         # this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux
         # the action uses the image for manylinux2010 but can generate also a manylinux1 wheel
         # change the tag of this image to change the image used
@@ -193,7 +171,6 @@ jobs:
           pip-wheel-args: "-w ./dist --no-use-pep517 -v --no-deps"
 
       - name: Create wheel for manylinux2014 for py3
-        if: ${{ matrix.python-version != 'cp27-cp27m' && matrix.python-version != 'cp27-cp27mu' }}
         # this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux
         # the action uses the image for manylinux2010 but can generate also a manylinux1 wheel
         # change the tag of this image to change the image used
@@ -208,22 +185,6 @@ jobs:
           # `--no-deps` is used to only generate the wheel for the current library. Redundant in sqlalchemy since it has no dependencies
           pip-wheel-args: "-w ./dist --no-use-pep517 -v --no-deps"
 
-      - name: Create wheel for manylinux py2
-        if: ${{ matrix.python-version == 'cp27-cp27m' || matrix.python-version == 'cp27-cp27mu' }}
-        # this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux
-        # the action uses the image for manylinux2010 but can generate also a manylinux1 wheel
-        # change the tag of this image to change the image used
-        uses: RalfG/python-wheels-manylinux-build@v0.3.4-manylinux1_x86_64
-        # this action generates 2 wheels in dist/. linux and manylinux1
-        with:
-          # python-versions is the output of the previous step and is in the form <python tag>-<abi tag>. Eg cp27-cp27mu
-          python-versions: ${{ matrix.python-version }}
-          build-requirements: "setuptools>=44 wheel>=0.34"
-          # Create the wheel using --no-use-pep517 since locally we have pyproject
-          # This flag should be removed once sqlalchemy supports pep517
-          # `--no-deps` is used to only generate the wheel for the current library. Redundant in sqlalchemy since it has no dependencies
-          pip-wheel-args: "-w ./dist --no-use-pep517 -v --no-deps"
-
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
@@ -256,12 +217,6 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           files: 'dist/*manylinux*'
 
-      - name: Set up Python for twine
-        # twine on py2 is very old and is no longer updated, so we change to python 3.8 before upload
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.8"
-
       - name: Publish wheel
         # the action https://github.com/marketplace/actions/pypi-publish runs only on linux and we cannot specify
         # additional options
@@ -286,7 +241,6 @@ jobs:
           - "ubuntu-latest"
         python-version:
           # the versions are <python tag>-<abi tag> as specified in PEP 425.
-          - cp36-cp36m
           - cp37-cp37m
           - cp38-cp38
           - cp39-cp39
@@ -357,7 +311,7 @@ jobs:
         # twine on py2 is very old and is no longer updated, so we change to python 3.8 before upload
         uses: actions/setup-python@v2
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Publish wheel
         # the action https://github.com/marketplace/actions/pypi-publish runs only on linux and we cannot specify

diff --git a/.github/workflows/run-on-pr.yaml b/.github/workflows/run-on-pr.yaml
index 2a04a1f0485b14e1530b3edb31606722e54f1e52..94db88ba0a275acbcb311d4f6d919ba9ed5acee7 100644 (file)
--- a/.github/workflows/run-on-pr.yaml
+++ b/.github/workflows/run-on-pr.yaml
@@ -22,7 +22,6 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
-          - "2.7"
           - "3.10"
         build-type:
           - "cext"

diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
index 5675ac6ec5db743a44486f8fd555dba7ab9a6574..6fbb29bdc94f26459a11e528afa7b4cbd19e2ee7 100644 (file)
--- a/.github/workflows/run-test.yaml
+++ b/.github/workflows/run-test.yaml
@@ -28,8 +28,6 @@ jobs:
           - "windows-latest"
           - "macos-latest"
         python-version:
-          - "2.7"
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
@@ -51,10 +49,6 @@ jobs:
             pytest-args: "--dbdriver pysqlite --dbdriver aiosqlite"
 
         exclude:
-          # c-extensions fail to build on windows for python 2.7
-          - os: "windows-latest"
-            python-version: "2.7"
-            build-type: "cext"
           # linux and osx do not have x86 python
           - os: "ubuntu-latest"
             architecture: x86
@@ -95,7 +89,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - cp36-cp36m
           - cp37-cp37m
           - cp38-cp38
           - cp39-cp39
@@ -136,7 +129,6 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
@@ -173,7 +165,7 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
-          - "3.9"
+          - "3.10"
 
       fail-fast: false