Resolve merge conflicts

.github/workflows/tests.yaml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        python-version: ["3.8", "3.13"]
+        python-version: ["3.9", "3.13"]
       fail-fast: false
     steps:
       - name: Checkout code
@@ -99,7 +99,7 @@ jobs:
       (github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]')
     strategy:
       matrix:
-        python-version: ["3.8", "3.13"]
+        python-version: ["3.9", "3.13"]
       fail-fast: false
     permissions:
       contents: read

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.8
+python_version = 3.9
 warn_unused_configs = True
 namespace_packages = True
 

noxfile.py

@@ -22,8 +22,8 @@
 ISORT_VERSION = "isort==5.13.2"
 LINT_PATHS = ["google", "tests", "noxfile.py", "setup.py"]
 
-SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-UNIT_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+SYSTEM_TEST_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
 
 @nox.session

requirements-test.txt

@@ -1,9 +1,9 @@
-asyncpg==0.29.0
+asyncpg==0.30.0
 mock==5.1.0
 pg8000==1.31.2
 psycopg2-binary==2.9.9
 pytest==8.3.3
 pytest-asyncio==0.24.0
 pytest-cov==5.0.0
 pytest-aiohttp==1.0.5
-SQLAlchemy[asyncio]==2.0.34
+SQLAlchemy[asyncio]==2.0.36

requirements.txt

@@ -1,6 +1,6 @@
 aiofiles==24.1.0
-aiohttp==3.10.5
-cryptography==43.0.1
-google-auth==2.34.0
+aiohttp==3.10.10
+cryptography==43.0.3
+google-auth==2.35.0
 requests==2.32.3
-protobuf==4.25.4
+protobuf==4.25.5

setup.py

@@ -66,7 +66,6 @@
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
@@ -80,7 +79,7 @@
         "pg8000": ["pg8000>=1.31.1"],
         "asyncpg": ["asyncpg>=0.29.0"],
     },
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     include_package_data=True,
     zip_safe=False,
     package_data={"google.cloud.alloydb.connector": ["py.typed"]},