From 17e6367271c9289e25fe224b2d8103937a648251 Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 3 Oct 2022 14:06:53 +0300 Subject: [PATCH 1/8] Remove py2.7 test on github workflow --- .github/workflows/tests.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 871bb40..c09dc0c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -19,7 +19,8 @@ jobs: - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38} - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37} - {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36} - - {name: '2.7', python: '2.7', os: ubuntu-16.04, tox: py27} + # ubuntu-16.04 is deprecated. TODO: remove python 2 support ? + # - {name: '2.7', python: '2.7', os: ubuntu-16.04, tox: py27} services: postfix: image: lavr/docker-postfix From be89e476ac3e8235876b10f0ef710632ef4c7668 Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 8 Jan 2024 20:45:58 +0300 Subject: [PATCH 2/8] py 3.13 --- .github/workflows/tests.yaml | 3 +++ tox.ini | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c09dc0c..65554f0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,6 +16,9 @@ jobs: fail-fast: false matrix: include: + - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311} + - {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310} + - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39} - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38} - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37} - {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36} diff --git a/tox.ini b/tox.ini index 03c560b..624de47 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] -envlist = py27, py34, py35, py36, py37, py38, pypy, style +envlist = py27, py34, py35, py36, py37, py38, py39, py310, py311, py312, py313, pypy, style [testenv] -passenv = TEST_* SMTP_TEST_* +passenv = TEST_*,SMTP_TEST_* commands = py.test --cov-report term --cov-report html --cov emails {posargs} [testenv:pypy] @@ -29,6 +29,27 @@ deps = deps = -rrequirements/tests.txt +[testenv:py39] +deps = + -rrequirements/tests.txt + +[testenv:py310] +deps = + -rrequirements/tests.txt + +[testenv:py311] +deps = + -rrequirements/tests.txt + +[testenv:py312] +deps = + -rrequirements/tests.txt + +[testenv:py313] +deps = + -rrequirements/tests.txt + + [testenv:style] deps = pre-commit skip_install = true From 1e4b4786c1f8ba9b2d0994141f4280398617419b Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 8 Jan 2024 20:47:03 +0300 Subject: [PATCH 3/8] github matrix --- .github/workflows/tests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 65554f0..3180c9c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,6 +16,8 @@ jobs: fail-fast: false matrix: include: + - {name: '3.13', python: '3.13', os: ubuntu-latest, tox: py313} + - {name: '3.12', python: '3.12', os: ubuntu-latest, tox: py312} - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311} - {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310} - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39} From 33d04a9e61983475e5eeb08681fac64b06d55704 Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 8 Jan 2024 20:50:33 +0300 Subject: [PATCH 4/8] python versions --- .github/workflows/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3180c9c..4e50708 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,14 +16,14 @@ jobs: fail-fast: false matrix: include: - - {name: '3.13', python: '3.13', os: ubuntu-latest, tox: py313} + - {name: '3.13', python: '3.13.0-alpha.2', os: ubuntu-latest, tox: py313} - {name: '3.12', python: '3.12', os: ubuntu-latest, tox: py312} - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311} - {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310} - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39} - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38} - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37} - - {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36} + - {name: '3.6', python: '3.6', os: ubuntu-20.04, tox: py36} # ubuntu-16.04 is deprecated. TODO: remove python 2 support ? # - {name: '2.7', python: '2.7', os: ubuntu-16.04, tox: py27} services: From 610f6b001ab2dbc8cd5a3a83965561b0819a8421 Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 8 Jan 2024 20:54:32 +0300 Subject: [PATCH 5/8] install some libs --- .github/workflows/tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4e50708..1b27ade 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -56,6 +56,7 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: pip|${{ runner.os }}|${{ matrix.python }}|${{ hashFiles('setup.py') }}|${{ hashFiles('requirements/*.txt') }} - run: pip install tox + - run: apt install libxml2-dev libxslt-dev - name: run rests env: SMTP_TEST_SUBJECT_SUFFIX: "github-actions sha:${{ github.sha }} run_id:${{ github.run_id }}" From 1d0bdadc194c5ebbb9f528fc5458a3c16bdc9e9b Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 8 Jan 2024 20:55:18 +0300 Subject: [PATCH 6/8] fix --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1b27ade..456a68a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -42,6 +42,7 @@ jobs: - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python }} + - run: apt install libxml2-dev libxslt-dev - name: update pip run: | pip install -U wheel @@ -56,7 +57,6 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: pip|${{ runner.os }}|${{ matrix.python }}|${{ hashFiles('setup.py') }}|${{ hashFiles('requirements/*.txt') }} - run: pip install tox - - run: apt install libxml2-dev libxslt-dev - name: run rests env: SMTP_TEST_SUBJECT_SUFFIX: "github-actions sha:${{ github.sha }} run_id:${{ github.run_id }}" From 962459315d1016dc97ded3f22079ab0549394b11 Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 8 Jan 2024 20:56:39 +0300 Subject: [PATCH 7/8] no libs install --- .github/workflows/tests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 456a68a..4e50708 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -42,7 +42,6 @@ jobs: - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python }} - - run: apt install libxml2-dev libxslt-dev - name: update pip run: | pip install -U wheel From 003edb2b96f7368e5ef07a91511761c530a482ae Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Mon, 8 Jan 2024 20:57:15 +0300 Subject: [PATCH 8/8] no 3.13 yet --- .github/workflows/tests.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4e50708..16ed35e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,7 +16,6 @@ jobs: fail-fast: false matrix: include: - - {name: '3.13', python: '3.13.0-alpha.2', os: ubuntu-latest, tox: py313} - {name: '3.12', python: '3.12', os: ubuntu-latest, tox: py312} - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311} - {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310} @@ -24,8 +23,6 @@ jobs: - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38} - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37} - {name: '3.6', python: '3.6', os: ubuntu-20.04, tox: py36} - # ubuntu-16.04 is deprecated. TODO: remove python 2 support ? - # - {name: '2.7', python: '2.7', os: ubuntu-16.04, tox: py27} services: postfix: image: lavr/docker-postfix