Merge branch 'main' into get_type_hints

Author: Daraan

.github/workflows/ci.yml

@@ -52,7 +52,9 @@ jobs:
           - "3.11"
           - "3.11.0"
           - "3.12"
+          - "3.12.0"
           - "3.13"
+          - "3.13.0"
           - "pypy3.8"
           - "pypy3.9"
           - "pypy3.10"

.github/workflows/third_party.yml

@@ -26,18 +26,20 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  skip-schedule-on-fork:
+    name: Check for schedule trigger on fork
+    runs-on: ubuntu-latest
+    # if 'schedule' was the trigger,
+    # don't run it on contributors' forks
+    if: >-
+      github.repository == 'python/typing_extensions'
+      || github.event_name != 'schedule'
+    steps:
+      - run: true
+
   pydantic:
     name: pydantic tests
-    if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+    needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
       matrix:
@@ -72,16 +74,7 @@ jobs:
 
   typing_inspect:
     name: typing_inspect tests
-    if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+    needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
       matrix:
@@ -117,16 +110,7 @@ jobs:
 
   pyanalyze:
     name: pyanalyze tests
-    if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+    needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
       matrix:
@@ -163,16 +147,7 @@ jobs:
 
   typeguard:
     name: typeguard tests
-    if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+    needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
       matrix:
@@ -210,16 +185,7 @@ jobs:
 
   typed-argument-parser:
     name: typed-argument-parser tests
-    if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+    needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
       matrix:
@@ -262,16 +228,7 @@ jobs:
 
   mypy:
     name: stubtest & mypyc tests
-    if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+    needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
       matrix:
@@ -309,16 +266,7 @@ jobs:
 
   cattrs:
     name: cattrs tests
-    if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+    needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
       matrix:

CHANGELOG.md

@@ -33,6 +33,8 @@ aliases that have a `Concatenate` special form as their argument.
 - Fix that lists and ... could not be used for parameter expressions for `TypeAliasType`
   instances before Python 3.11.
   Patch by [Daraan](https://github.com/Daraan).
+- Fix error on Python 3.10 when using `typing.Concatenate` and 
+  `typing_extensions.Concatenate` together. Patch by [Daraan](https://github.com/Daraan).
 
 # Release 4.12.2 (June 7, 2024)