From e4fe3280ac528b100a399c30c90a9eec6dfecfec Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Thu, 9 Sep 2021 22:02:35 +0600 Subject: [PATCH] drop python 3.6 from CI (#1382) * drop python 3.6 from CI * Drop 3.6 from CI matrix. Co-authored-by: Omer Katz --- .github/workflows/ci.yaml | 6 +++--- tox.ini | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0a88ad2f..52ce3eb1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6,3.7,3.8,3.9] + python-version: [3.7,3.8,3.9] steps: - name: Install system packages run: sudo apt update && sudo apt-get install libcurl4-openssl-dev libssl-dev @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6,3.7,3.8,3.9,pypy3] + python-version: [3.7,3.8,3.9,pypy3] steps: - name: Install system packages run: sudo apt update && sudo apt-get install libcurl4-openssl-dev libssl-dev @@ -44,7 +44,7 @@ jobs: run: tox -v -e ${{ matrix.python-version }}-linux-integration-py-amqp -- -v - name: Run redis integration tests run: tox -v -e ${{ matrix.python-version }}-linux-integration-py-redis -- -v - + #################### Linters and checkers #################### lint: needs: [unittest, integration] diff --git a/tox.ini b/tox.ini index ddfd8aab..97cd2d78 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = - {pypy3,3.6,3.7,3.8,3.9}-unit - {pypy3,3.6,3.7,3.8,3.9}-linux-integration-py-amqp - {pypy3,3.6,3.7,3.8,3.9}-linux-integration-redis + {pypy3,3.7,3.8,3.9}-unit + {pypy3,3.7,3.8,3.9}-linux-integration-py-amqp + {pypy3,3.7,3.8,3.9}-linux-integration-redis flake8 flakeplus apicheck @@ -17,9 +17,9 @@ passenv = DISTUTILS_USE_SDK deps= -r{toxinidir}/requirements/dev.txt - apicheck,pypy3,3.6,3.7,3.8,3.9: -r{toxinidir}/requirements/default.txt - apicheck,pypy3,3.6,3.7,3.8,3.9: -r{toxinidir}/requirements/test.txt - apicheck,pypy3,3.6,3.7-linux,3.8-linux,3.9-linux: -r{toxinidir}/requirements/test-ci.txt + apicheck,pypy3,3.7,3.8,3.9: -r{toxinidir}/requirements/default.txt + apicheck,pypy3,3.7,3.8,3.9: -r{toxinidir}/requirements/test.txt + apicheck,pypy3,3.7-linux,3.8-linux,3.9-linux: -r{toxinidir}/requirements/test-ci.txt 3.7-windows,3.8-windows,3.9-windows: -r{toxinidir}/requirements/test-ci-windows.txt apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt @@ -30,7 +30,6 @@ commands = integration-redis: py.test -xv -E redis t/integration {posargs:-n2} basepython = - 3.6: python3.6 3.7: python3.7 3.8: python3.8 3.9,apicheck,pydocstyle,flake8,linkcheck,cov: python3.9