From 7f1a55fc023cb6b3f31b2604b1f5d1c3c54fe88c Mon Sep 17 00:00:00 2001
From: Timofey Koolin <timofey.koolin@gmail.com>
Date: Tue, 10 Jan 2023 11:03:35 +0300
Subject: [PATCH 1/2] remove basepython and python version from tox env

---
 .github/workflows/tests.yaml |  2 +-
 tox.ini                      | 21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9fdadecd..eb194987 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -13,7 +13,7 @@ jobs:
       max-parallel: 4
       matrix:
         python-version: [3.8]
-        environment: [py38, py38-tls, py38-proto3, py38-tls-proto3]
+        environment: [py, py-tls, py-proto3, py-tls-proto3]
 
     steps:
     - uses: actions/checkout@v1
diff --git a/tox.ini b/tox.ini
index a25d55e9..f97db7cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,10 @@
 [tox]
-envlist = py36,py38,py38,style,pylint,black,protoc
-minversion = 3.14.4
+envlist = py,py-proto3,py-tls,py-tls-proto3,style,pylint,black,protoc
+minversion = 4.2.6
 skipsdist = True
 ignore_basepython_conflict = true
 
 [testenv]
-basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 setenv =
@@ -23,36 +22,28 @@ deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<4.0.0
 
-[testenv:py38]
+[testenv:py]
 commands =
     pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
 
-[testenv:py38-proto3]
+[testenv:py-proto3]
 commands =
     pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
 deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<4.0.0
 
-[testenv:py38-tls]
+[testenv:py-tls]
 commands =
     pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
 
-[testenv:py38-tls-proto3]
+[testenv:py-tls-proto3]
 commands =
     pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
 deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<4.0.0
 
-[testenv:py310]
-commands =
-    pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
-
-[testenv:py310-tls]
-commands =
-    pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
-
 [testenv:black-format]
 skip_install = true
 deps = black

From a02cf57bad0014f6e0b371aaed2f9c524cbca563 Mon Sep 17 00:00:00 2001
From: Timofey Koolin <timofey.koolin@gmail.com>
Date: Tue, 10 Jan 2023 11:17:34 +0300
Subject: [PATCH 2/2] update tox to latest current version

---
 .github/workflows/style.yaml | 2 +-
 .github/workflows/tests.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
index 5f3e25b5..8723d8f2 100644
--- a/.github/workflows/style.yaml
+++ b/.github/workflows/style.yaml
@@ -22,6 +22,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install tox==4.2.4
+        pip install tox==4.2.6
     - name: Test with tox
       run: tox -e ${{ matrix.environment }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index eb194987..71bdf07f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -24,6 +24,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install tox==4.2.4
+        pip install tox==4.2.6
     - name: Test with tox
       run: tox -e ${{ matrix.environment }}