feat: add support for python 3.10 (#227)

Author: jackwotherspoon

.kokoro/python3.10/linux/common.cfg

@@ -0,0 +1,41 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Get secrets for tests.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/cloud-sql/python-connector"
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "cloud-sql-python-connector/.kokoro/trampoline.sh"
+
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "python:3.10-buster"
+}
+
+# Tell the trampoline which tests to run.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/cloud-sql-python-connector/.kokoro/tests/run_tests.sh"
+}
+
+# Specify which tests to run
+env_vars: {
+    key: "RUN_TESTS_SESSION"
+    value: "test-3.10"
+}

.kokoro/python3.10/linux/continuous.cfg

@@ -0,0 +1,15 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto

.kokoro/python3.10/linux/periodic.cfg

@@ -0,0 +1,15 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto

.kokoro/python3.10/linux/presubmit.cfg

@@ -0,0 +1,15 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto

google/cloud/sql/connector/instance_connection_manager.py

@@ -258,7 +258,7 @@ def __init__(
 
         async def _set_instance_data() -> None:
             logger.debug("Updating instance data")
-            self._refresh_in_progress = asyncio.locks.Event(loop=self._loop)
+            self._refresh_in_progress = asyncio.locks.Event()
             self._current = self._loop.create_task(self._get_instance_data())
             self._next = self._loop.create_task(self._schedule_refresh())
 

google/cloud/sql/connector/rate_limiter.py

@@ -46,7 +46,7 @@ def __init__(
         self.rate = rate
         self.max_capacity = max_capacity
         self._loop = loop or asyncio.get_event_loop()
-        self._lock = asyncio.Lock(loop=self._loop)
+        self._lock = asyncio.Lock()
         self._tokens: float = max_capacity
         self._last_token_update = self._loop.time()
 
@@ -70,7 +70,7 @@ async def _wait_for_next_token(self) -> None:
         token_deficit = 1 - self._tokens
         if token_deficit > 0:
             wait_time = token_deficit / self.rate
-            await asyncio.sleep(wait_time, loop=self._loop)
+            await asyncio.sleep(wait_time)
 
     async def acquire(self) -> None:
         """

noxfile.py

@@ -81,17 +81,17 @@ def default(session, path):
     )
 
 
-@nox.session(python=["3.6", "3.7", "3.8", "3.9"])
+@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10"])
 def unit(session):
     default(session, os.path.join("tests", "unit"))
 
 
-@nox.session(python=["3.6", "3.7", "3.8", "3.9"])
+@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10"])
 def system(session):
     default(session, os.path.join("tests", "system"))
 
 
-@nox.session(python=["3.6", "3.7", "3.8", "3.9"])
+@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10"])
 def test(session):
     default(session, os.path.join("tests", "unit"))
     default(session, os.path.join("tests", "system"))

setup.py

@@ -71,6 +71,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     platforms="Posix; MacOS X; Windows",
     packages=packages,

tests/unit/test_connector.py

@@ -32,7 +32,7 @@ def test_connect_timeout(
 
     async def timeout_stub(*args: Any, **kwargs: Any) -> None:
         try:
-            await asyncio.sleep(timeout + 10, loop=async_loop)
+            await asyncio.sleep(timeout + 10)
         except asyncio.CancelledError:
             return None