Merge branch 'main' into add-version-module

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:3e3800bb100af5d7f9e810d48212b37812c1856d20ffeafb99ebe66461b61fc7
-# created: 2023-08-02T10:53:29.114535628Z
+  digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
+# created: 2023-11-08T19:46:45.022803742Z

.github/sync-repo-settings.yaml

@@ -11,12 +11,20 @@ branchProtectionRules:
     - 'unit (3.6, cpp)'
     - 'unit (3.7)'
     - 'unit (3.7, cpp)'
+    - 'unit (3.7, upb)'
     - 'unit (3.8)'
-    - 'unit (3.9, cpp)'
+    - 'unit (3.8, cpp)'
+    - 'unit (3.8, upb)'
     - 'unit (3.9)'
-    - 'unit (3.10, cpp)'
+    - 'unit (3.9, cpp)'
+    - 'unit (3.9, upb)'
     - 'unit (3.10)'
+    - 'unit (3.10, cpp)'
+    - 'unit (3.10, upb)'
     - 'unit (3.11)'
+    - 'unit (3.11, upb)'
+    - 'unit (3.12)'
+    - 'unit (3.12, upb)'
     - cover
     - OwlBot Post Processor
     - 'cla/google'

.github/workflows/tests.yml

@@ -42,11 +42,13 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
+        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         variant: ['', 'cpp', 'upb']
         exclude:
           - variant: "cpp"
             python: 3.11
+          - variant: "cpp"
+            python: 3.12
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}

noxfile.py

@@ -29,6 +29,7 @@
     "3.9",
     "3.10",
     "3.11",
+    "3.12",
 ]
 
 # Error if a python version is missing
@@ -48,9 +49,14 @@ def unit(session, proto="python"):
     session.install("-e", ".[testing]", "-c", constraints_path)
     if proto == "cpp":  # 4.20 does not have cpp.
         session.install("protobuf==3.19.0")
+
+    # TODO(https://github.com/googleapis/proto-plus-python/issues/403): re-enable `-W=error`
+    # The warnings-as-errors flag `-W=error` was removed in
+    # https://github.com/googleapis/proto-plus-python/pull/400.
+    # It should be re-added once issue
+    # https://github.com/protocolbuffers/protobuf/issues/12186 is fixed.
     session.run(
         "py.test",
-        "-W=error",
         "--quiet",
         *(
             session.posargs  # Coverage info when running individual tests is annoying.

proto/datetime_helpers.py

@@ -21,7 +21,8 @@
 from google.protobuf import timestamp_pb2
 
 
-_UTC_EPOCH = datetime.datetime.utcfromtimestamp(0).replace(tzinfo=datetime.timezone.utc)
+_UTC_EPOCH = datetime.datetime.fromtimestamp(0, datetime.timezone.utc)
+
 _RFC3339_MICROS = "%Y-%m-%dT%H:%M:%S.%fZ"
 _RFC3339_NO_FRACTION = "%Y-%m-%dT%H:%M:%S"
 # datetime.strptime cannot handle nanosecond precision:  parse w/ regex

setup.py

@@ -59,6 +59,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],