Merge "remove all python_version<3 specs; update pytest" into main

2 files changed, 20 insertions, 26 deletions

diff --git a/setup.cfg b/setup.cfg
index 0ccad1003..80582f604 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,51 +35,48 @@ package_dir =
 
 install_requires =
     importlib-metadata;python_version<"3.8"
-    greenlet != 0.4.17;python_version>='3' and (platform_machine=='aarch64' or (platform_machine=='ppc64le' or (platform_machine=='x86_64' or (platform_machine=='amd64' or (platform_machine=='AMD64' or (platform_machine=='win32' or platform_machine=='WIN32'))))))
+    greenlet != 0.4.17;(platform_machine=='aarch64' or (platform_machine=='ppc64le' or (platform_machine=='x86_64' or (platform_machine=='amd64' or (platform_machine=='AMD64' or (platform_machine=='win32' or platform_machine=='WIN32'))))))
     typing-extensions >= 4;python_version<"3.11"
 
 [options.extras_require]
 asyncio =
-    greenlet!=0.4.17;python_version>="3"
+    greenlet!=0.4.17
 mypy =
-    mypy >= 0.910;python_version>="3"
+    mypy >= 0.910
     sqlalchemy2-stubs
 mssql = pyodbc
 mssql_pymssql = pymssql
 mssql_pyodbc = pyodbc
 mysql =
-    mysqlclient>=1.4.0,<2;python_version<"3"
-    mysqlclient>=1.4.0;python_version>="3"
+    mysqlclient>=1.4.0
 mysql_connector =
     mysql-connector-python
 mariadb_connector =
-    mariadb>=1.0.1;python_version>="3"
+    mariadb>=1.0.1
 oracle =
-    cx_oracle>=7,<8;python_version<"3"
-    cx_oracle>=7;python_version>="3"
+    cx_oracle>=7
 postgresql = psycopg2>=2.7
 postgresql_pg8000 = pg8000>=1.16.6
 postgresql_asyncpg =
     %(asyncio)s
-    asyncpg;python_version>="3"
+    asyncpg
 postgresql_psycopg2binary = psycopg2-binary
 postgresql_psycopg2cffi = psycopg2cffi
 postgresql_psycopg = psycopg>=3.0.7
 pymysql =
-    pymysql;python_version>="3"
-    pymysql<1;python_version<"3"
+    pymysql
 aiomysql =
     %(asyncio)s
-    aiomysql;python_version>="3"
+    aiomysql
 asyncmy =
     %(asyncio)s
-    asyncmy>=0.2.3;python_version>="3"
+    asyncmy>=0.2.3
 aiosqlite =
     %(asyncio)s
-    aiosqlite;python_version>="3"
+    aiosqlite
     typing_extensions!=3.10.0.1
 sqlcipher =
-    sqlcipher3_binary;python_version>="3"
+    sqlcipher3_binary
 
 [egg_info]
 tag_build = dev
diff --git a/tox.ini b/tox.ini
index 5ac5ef1a2..a204b02a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,23 +16,21 @@ usedevelop=
      cov: True
 
 deps=
-     pytest>=4.6.11,<5.0; python_version < '3'
-     pytest>=6.2,<8; python_version >= '3'
+     pytest>=7.0.0rc1,<8
      pytest-xdist
-     mock; python_version < '3.3'
 
      sqlite: .[aiosqlite]
      sqlite_file: .[aiosqlite]
-     sqlite_file: .[sqlcipher]; python_version >= '3' and python_version < '3.10'
+     sqlite_file: .[sqlcipher]; python_version < '3.10'
      postgresql: .[postgresql]
-     postgresql: .[postgresql_asyncpg]; python_version >= '3'
-     postgresql: .[postgresql_pg8000]; python_version >= '3'
-     postgresql: .[postgresql_psycopg]; python_version >= '3'
+     postgresql: .[postgresql_asyncpg]
+     postgresql: .[postgresql_pg8000]
+     postgresql: .[postgresql_psycopg]
 
      mysql: .[mysql]
      mysql: .[pymysql]
-     mysql: .[asyncmy]; python_version >= '3'
-     mysql: .[mariadb_connector]; python_version >= '3'
+     mysql: .[asyncmy]
+     mysql: .[mariadb_connector]
 
      oracle: .[oracle]
 
@@ -127,10 +125,9 @@ commands=
 
 [testenv:mypy]
 deps=
-     pytest>=6.2; python_version >= '3'
+     pytest>=7.0.0rc1,<8
      pytest-xdist
      greenlet != 0.4.17
-     mock; python_version < '3.3'
      importlib_metadata; python_version < '3.8'
      mypy
      patch==1.*