SNOW-997139: Support Python 3.12 (#1841)

sfc-gh-aling · web-flow · commit 93c9b69f9e2d · 2024-01-03T16:23:28.000-08:00
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -80,7 +80,7 @@ jobs:
             id: macosx_x86_64
           - image: macos-latest
             id: macosx_arm64
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     name: Build ${{ matrix.os.id }}-py${{ matrix.python-version }}
     runs-on: ${{ matrix.os.image }}
     steps:
@@ -96,7 +96,7 @@ jobs:
           platforms: all
       - uses: actions/checkout@v3
       - name: Building wheel
-        uses: pypa/cibuildwheel@v2.12.0
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_BUILD: cp${{ env.shortver }}-${{ matrix.os.id }}
           MACOSX_DEPLOYMENT_TARGET: 10.14  # Should be kept in sync with ci/build_darwin.sh
@@ -124,7 +124,7 @@ jobs:
            download_name: macosx_x86_64
          - image_name: windows-2019
            download_name: win_amd64
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         cloud-provider: [aws, azure, gcp]
     steps:
       - uses: actions/checkout@v3
@@ -289,7 +289,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         cloud-provider: [aws]
     steps:
       - name: Set shortver
diff --git a/.github/workflows/create_req_files.yml b/.github/workflows/create_req_files.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
@@ -12,6 +12,7 @@ Source code is also available at: https://github.com/snowflakedb/snowflake-conne
 
   - Added a new boolean parameter `force_return_table` to `SnowflakeCursor.fetch_arrow_all` to force returning `pyarrow.Table` in case of zero rows.
   - Cleanup some C++ code warnings and performance issues.
+  - Added support for Python 3.12
 
 - v3.6.0(December 09,2023)
 
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,6 +51,7 @@ timestamps {
           'Test Python 39': { build job: 'RT-PyConnector39-PC',parameters: params},
           'Test Python 310': { build job: 'RT-PyConnector310-PC',parameters: params},
           'Test Python 311': { build job: 'RT-PyConnector311-PC',parameters: params},
+          'Test Python 312': { build job: 'RT-PyConnector312-PC',parameters: params},
           )
         }
       }
diff --git a/ci/build_darwin.sh b/ci/build_darwin.sh
@@ -5,9 +5,9 @@
 #   - To compile only a specific version(s) pass in versions like: `./build_darwin.sh "3.8 3.9"`
 arch=$(uname -m)
 if [[ "$arch" == "arm64" ]]; then
-  PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11}"
+  PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11 3.12}"
 else
-  PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11}"
+  PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11 3.12}"
 fi
 
 THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
@@ -7,7 +7,7 @@
 set -o pipefail
 
 U_WIDTH=16
-PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11}"
+PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11 3.12}"
 THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CONNECTOR_DIR="$(dirname "${THIS_DIR}")"
 DIST_DIR="${CONNECTOR_DIR}/dist"
diff --git a/ci/build_windows.bat b/ci/build_windows.bat
@@ -6,7 +6,7 @@
 SET SCRIPT_DIR=%~dp0
 SET CONNECTOR_DIR=%~dp0\..\
 
-set python_versions= 3.8 3.9 3.10 3.11
+set python_versions= 3.8 3.9 3.10 3.11 3.12
 
 cd %CONNECTOR_DIR%
 
diff --git a/ci/docker/connector_build/Dockerfile b/ci/docker/connector_build/Dockerfile
@@ -14,6 +14,6 @@ WORKDIR /home/user
 RUN chmod 777 /home/user
 RUN git clone https://github.com/matthew-brett/multibuild.git && cd /home/user/multibuild && git checkout bfc6d8b82d8c37b8ca1e386081fd800e81c6ab4a
 
-ENV PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin"
+ENV PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin:/opt/python/cp312-cp312/bin"
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/ci/docker/connector_test/Dockerfile b/ci/docker/connector_test/Dockerfile
@@ -12,6 +12,6 @@ RUN chmod +x /usr/local/bin/entrypoint.sh
 
 WORKDIR /home/user
 RUN chmod 777 /home/user
-ENV PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin/:/opt/python/cp39-cp39/bin/:/opt/python/cp310-cp310/bin/:/opt/python/cp311-cp311/bin/"
+ENV PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin/:/opt/python/cp39-cp39/bin/:/opt/python/cp310-cp310/bin/:/opt/python/cp311-cp311/bin/:/opt/python/cp312-cp312/bin/"
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/ci/docker/connector_test_lambda/Dockerfile312 b/ci/docker/connector_test_lambda/Dockerfile312
@@ -0,0 +1,10 @@
+FROM public.ecr.aws/lambda/python:3.12-x86_64
+
+WORKDIR /home/user/snowflake-connector-python
+RUN chmod 777 /home/user/snowflake-connector-python
+ENV PATH="${PATH}:/opt/python/cp312-cp312/bin/"
+ENV PYTHONPATH="${PYTHONPATH}:/home/user/snowflake-connector-python/ci/docker/connector_test_lambda/"
+
+RUN pip3 install -U pip setuptools wheel tox tox-external_wheels
+
+CMD [ "app.handler" ]
diff --git a/ci/docker/connector_test_lambda/app.py b/ci/docker/connector_test_lambda/app.py
@@ -6,7 +6,7 @@
 
 LOGGER = logging.getLogger(__name__)
 REPO_PATH = "/home/user/snowflake-connector-python"
-PY_SHORT_VER = f"{sys.version_info[0]}{sys.version_info[1]}"  # 38, 39, 310, 311
+PY_SHORT_VER = f"{sys.version_info[0]}{sys.version_info[1]}"  # 38, 39, 310, 311, 312
 ARCH = "x86"  # x86, aarch64
 
 
diff --git a/ci/test_darwin.sh b/ci/test_darwin.sh
@@ -5,7 +5,7 @@
 #   - Versions to be tested should be passed in as the first argument, e.g: "3.8 3.9". If omitted 3.8-3.11 will be assumed.
 #   - This script uses .. to download the newest wheel files from S3
 
-PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11}"
+PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11 3.12}"
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CONNECTOR_DIR="$( dirname "${THIS_DIR}")"
 PARAMETERS_DIR="${CONNECTOR_DIR}/.github/workflows/parameters/public"
diff --git a/ci/test_linux.sh b/ci/test_linux.sh
@@ -6,7 +6,7 @@
 #   - This script assumes that ../dist/repaired_wheels has the wheel(s) built for all versions to be tested
 #   - This is the script that test_docker.sh runs inside of the docker container
 
-PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11}"
+PYTHON_VERSIONS="${1:-3.8 3.9 3.10 3.11 3.12}"
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CONNECTOR_DIR="$( dirname "${THIS_DIR}")"
 
diff --git a/setup.cfg b/setup.cfg
@@ -24,6 +24,7 @@ classifiers =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Programming Language :: SQL
     Topic :: Database
     Topic :: Scientific/Engineering :: Information Analysis
diff --git a/src/snowflake/connector/arrow_context.py b/src/snowflake/connector/arrow_context.py
@@ -7,7 +7,7 @@
 
 import decimal
 import time
-from datetime import datetime, timedelta, tzinfo
+from datetime import datetime, timedelta, timezone, tzinfo
 from logging import getLogger
 from sys import byteorder
 from typing import TYPE_CHECKING
@@ -33,7 +33,7 @@
 except ImportError:
     tzlocal = None
 
-ZERO_EPOCH = datetime.utcfromtimestamp(0)
+ZERO_EPOCH = datetime.fromtimestamp(0, timezone.utc).replace(tzinfo=None)
 
 logger = getLogger(__name__)
 
@@ -99,7 +99,9 @@ def TIMESTAMP_TZ_to_python_windows(
         return t.replace(tzinfo=tzinfo)
 
     def TIMESTAMP_NTZ_to_python(self, epoch: int, microseconds: int) -> datetime:
-        return datetime.utcfromtimestamp(epoch) + timedelta(microseconds=microseconds)
+        return datetime.fromtimestamp(epoch, timezone.utc).replace(
+            tzinfo=None
+        ) + timedelta(microseconds=microseconds)
 
     def TIMESTAMP_NTZ_to_python_windows(
         self, epoch: int, microseconds: int
diff --git a/src/snowflake/connector/auth/_auth.py b/src/snowflake/connector/auth/_auth.py
@@ -11,7 +11,7 @@
 import tempfile
 import time
 import uuid
-from datetime import datetime
+from datetime import datetime, timezone
 from os import getenv, makedirs, mkdir, path, remove, removedirs, rmdir
 from os.path import expanduser
 from threading import Lock, Thread
@@ -392,7 +392,7 @@ def post_request_wrapper(self, url, headers, body) -> None:
                     "Token expires at: %s. "
                     "Current Time: %s",
                     str(auth_instance._jwt_token_exp),
-                    str(datetime.utcnow()),
+                    str(datetime.now(timezone.utc).replace(tzinfo=None)),
                 )
             from . import AuthByUsrPwdMfa
 
diff --git a/src/snowflake/connector/auth/keypair.py b/src/snowflake/connector/auth/keypair.py
@@ -8,7 +8,7 @@
 import base64
 import hashlib
 import os
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from logging import getLogger
 from typing import Any
 
@@ -103,7 +103,7 @@ def prepare(
         account = account.upper()
         user = user.upper()
 
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc).replace(tzinfo=None)
 
         if isinstance(self._private_key, bytes):
             try:
diff --git a/src/snowflake/connector/azure_storage_client.py b/src/snowflake/connector/azure_storage_client.py
@@ -7,7 +7,7 @@
 import json
 import os
 import xml.etree.ElementTree as ET
-from datetime import datetime
+from datetime import datetime, timezone
 from logging import getLogger
 from random import choice
 from string import hexdigits
@@ -90,7 +90,7 @@ def _send_request_with_authentication_and_retry(
             headers = {}
 
         def generate_authenticated_url_and_rest_args() -> tuple[bytes, dict[str, Any]]:
-            curtime = datetime.utcnow()
+            curtime = datetime.now(timezone.utc).replace(tzinfo=None)
             timestamp = curtime.strftime("YYYY-MM-DD")
             sas_token = self.credentials.creds["AZURE_SAS_TOKEN"]
             if sas_token and sas_token.startswith("?"):
diff --git a/src/snowflake/connector/connection_diagnostic.py b/src/snowflake/connector/connection_diagnostic.py
@@ -211,7 +211,7 @@ def __test_socket_get_cert(
                     conn.send(str.encode(connect))
                     conn.recv(4096).decode("utf-8")
 
-                context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+                context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
                 sock = context.wrap_socket(conn, server_hostname=host)
                 certificate = ssl.DER_cert_to_PEM_cert(sock.getpeercert(True))
                 conn.close()
diff --git a/src/snowflake/connector/converter.py b/src/snowflake/connector/converter.py
@@ -11,7 +11,7 @@
 import time
 from datetime import date, datetime
 from datetime import time as dt_t
-from datetime import timedelta, tzinfo
+from datetime import timedelta, timezone, tzinfo
 from functools import partial
 from logging import getLogger
 from math import ceil
@@ -42,7 +42,7 @@
 BITS_FOR_TIMEZONE = 14
 ZERO_TIMEDELTA = timedelta(seconds=0)
 ZERO_EPOCH_DATE = date(1970, 1, 1)
-ZERO_EPOCH = datetime.utcfromtimestamp(0)
+ZERO_EPOCH = datetime.fromtimestamp(0, timezone.utc).replace(tzinfo=None)
 ZERO_FILL = "000000000"
 
 logger = getLogger(__name__)
@@ -220,7 +220,11 @@ def _DATE_to_python(self, _: dict[str, str | None]) -> Callable:
 
         def conv(value: str) -> date:
             try:
-                return datetime.utcfromtimestamp(int(value) * 86400).date()
+                return (
+                    datetime.fromtimestamp(int(value) * 86400, timezone.utc)
+                    .replace(tzinfo=None)
+                    .date()
+                )
             except (OSError, ValueError) as e:
                 logger.debug("Failed to convert: %s", e)
                 ts = ZERO_EPOCH + timedelta(seconds=int(value) * (24 * 60 * 60))
@@ -318,11 +322,19 @@ def _TIME_to_python(self, ctx: dict[str, Any]) -> Callable:
         scale = ctx["scale"]
 
         def conv0(value: str) -> time:
-            return datetime.utcfromtimestamp(float(value)).time()
+            return (
+                datetime.fromtimestamp(float(value), timezone.utc)
+                .replace(tzinfo=None)
+                .time()
+            )
 
         def conv(value: str) -> dt_t:
             microseconds = float(value[0 : -scale + 6])
-            return datetime.utcfromtimestamp(microseconds).time()
+            return (
+                datetime.fromtimestamp(microseconds, timezone.utc)
+                .replace(tzinfo=None)
+                .time()
+            )
 
         return conv if scale > 6 else conv0
 
@@ -763,5 +775,7 @@ def create_timestamp_from_string(
             value=value, scale=scale
         )
         if not tz:
-            return datetime.utcfromtimestamp(seconds) + timedelta(microseconds=fraction)
+            return datetime.fromtimestamp(seconds, timezone.utc).replace(
+                tzinfo=None
+            ) + timedelta(microseconds=fraction)
         return datetime.fromtimestamp(seconds, tz=tz) + timedelta(microseconds=fraction)
diff --git a/src/snowflake/connector/converter_issue23517.py b/src/snowflake/connector/converter_issue23517.py
@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime, time, timedelta, tzinfo
+from datetime import datetime, time, timedelta, timezone, tzinfo
 from functools import partial
 from logging import getLogger
 
@@ -83,9 +83,9 @@ def create_timestamp_from_string(
             value=value, scale=scale
         )
         if not tz:
-            return datetime.utcfromtimestamp(0) + timedelta(
-                seconds=seconds, microseconds=fraction
-            )
+            return datetime.fromtimestamp(0, timezone.utc).replace(
+                tzinfo=None
+            ) + timedelta(seconds=seconds, microseconds=fraction)
         return datetime.fromtimestamp(0, tz=tz) + timedelta(
             seconds=seconds, microseconds=fraction
         )
diff --git a/src/snowflake/connector/ocsp_snowflake.py b/src/snowflake/connector/ocsp_snowflake.py
@@ -15,7 +15,7 @@
 import time
 import traceback
 from base64 import b64decode, b64encode
-from datetime import datetime
+from datetime import datetime, timezone
 from logging import getLogger
 from os import environ, path
 from os.path import expanduser
@@ -261,7 +261,7 @@ def generate_telemetry_data(
         return telemetry_data
         # To be updated once Python Driver has out of band telemetry.
         # telemetry_client = TelemetryClient()
-        # telemetry_client.add_log_to_batch(TelemetryData(telemetry_data, datetime.utcnow()))
+        # telemetry_client.add_log_to_batch(TelemetryData(telemetry_data, datetime.now(timezone.utc).replace(tzinfo=None))
 
 
 class OCSPServer:
@@ -851,7 +851,7 @@ class SnowflakeOCSP:
     MAX_CLOCK_SKEW = 900
 
     # Epoch time
-    ZERO_EPOCH = datetime.utcfromtimestamp(0)
+    ZERO_EPOCH = datetime.fromtimestamp(0, timezone.utc).replace(tzinfo=None)
 
     # Timestamp format for logging
     OUTPUT_TIMESTAMP_FORMAT = "%Y-%m-%d %H:%M:%SZ"
diff --git a/src/snowflake/connector/s3_storage_client.py b/src/snowflake/connector/s3_storage_client.py
@@ -7,7 +7,7 @@
 import binascii
 import re
 import xml.etree.ElementTree as ET
-from datetime import datetime
+from datetime import datetime, timezone
 from io import IOBase
 from logging import getLogger
 from operator import itemgetter
@@ -308,7 +308,7 @@ def _send_request_with_authentication_and_retry(
             )
 
         def generate_authenticated_url_and_args_v4() -> tuple[bytes, dict[str, bytes]]:
-            t = datetime.utcnow()
+            t = datetime.now(timezone.utc).replace(tzinfo=None)
             amzdate = t.strftime("%Y%m%dT%H%M%SZ")
             short_amzdate = amzdate[:8]
             x_amz_headers["x-amz-date"] = amzdate
diff --git a/src/snowflake/connector/telemetry_oob.py b/src/snowflake/connector/telemetry_oob.py
@@ -97,7 +97,9 @@ def to_dict(self):
         event.update(
             {
                 "UUID": str(uuid.uuid4()),
-                "Created_On": datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),
+                "Created_On": datetime.datetime.now(datetime.timezone.utc)
+                .replace(tzinfo=None)
+                .strftime("%Y-%m-%d %H:%M:%S"),
                 "Type": self.get_type(),
                 "SchemaVersion": 1,
             }
diff --git a/src/snowflake/connector/tool/dump_ocsp_response_cache.py b/src/snowflake/connector/tool/dump_ocsp_response_cache.py
diff --git a/test/integ/test_bindings.py b/test/integ/test_bindings.py
diff --git a/test/integ/test_converter_null.py b/test/integ/test_converter_null.py
diff --git a/test/integ/test_cursor.py b/test/integ/test_cursor.py
diff --git a/test/integ/test_key_pair_authentication.py b/test/integ/test_key_pair_authentication.py
diff --git a/test/integ/test_put_get_medium.py b/test/integ/test_put_get_medium.py
diff --git a/test/unit/test_auth.py b/test/unit/test_auth.py
diff --git a/test/unit/test_connection_diagnostic.py b/test/unit/test_connection_diagnostic.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ timestamps {`
`51`	`51`	`'Test Python 39': { build job: 'RT-PyConnector39-PC',parameters: params},`
`52`	`52`	`'Test Python 310': { build job: 'RT-PyConnector310-PC',parameters: params},`
`53`	`53`	`'Test Python 311': { build job: 'RT-PyConnector311-PC',parameters: params},`
	`54`	`+ 'Test Python 312': { build job: 'RT-PyConnector312-PC',parameters: params},`
`54`	`55`	`)`
`55`	`56`	`}`
`56`	`57`	`}`