Merge branch 'main' into patch-1

Author: srittau

.flake8

@@ -1,6 +1,7 @@
 [flake8]
 
 max-line-length = 90
+exclude = conformance
 ignore =
   # irrelevant plugins
   B3,

.github/ISSUE_TEMPLATE/documentation-issue.md

@@ -1,6 +1,6 @@
 ---
 name: Documentation issue
-about: Report a problem or suggest changes for the documentation at https://typing.readthedocs.io/
+about: Report a problem or suggest changes for the documentation at https://typing.python.org/
 title: ''
 labels: 'topic: documentation'
 assignees: ''

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: monthly
+    groups:
+      actions:
+        patterns:
+          - "*"

.github/workflows/build-docs.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install dependencies

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python 3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3
           cache: "pip"

.pre-commit-config.yaml

@@ -0,0 +1,24 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: trailing-whitespace
+        exclude: conformance/results/.*/.*\.toml
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-toml
+      - id: check-merge-conflict
+      - id: mixed-line-ending
+        args: [--fix=lf]
+        exclude: docs/make\.bat
+      - id: check-case-conflict
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+
+ci:
+  autofix_commit_msg: "[pre-commit.ci] auto fixes from pre-commit.com hooks"
+  autofix_prs: true
+  autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
+  autoupdate_schedule: quarterly
+  submodules: false

.readthedocs.yaml

@@ -0,0 +1,16 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+  - requirements: docs/requirements.txt

LICENSE

@@ -13,12 +13,11 @@ software.
 
 In May 2000, Guido and the Python core development team moved to
 BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Digital Creations (now Zope
-Corporation, see http://www.zope.com).  In 2001, the Python Software
-Foundation (PSF, see http://www.python.org/psf/) was formed, a
-non-profit organization created specifically to own Python-related
-Intellectual Property.  Zope Corporation is a sponsoring member of
-the PSF.
+year, the PythonLabs team moved to Digital Creations, which became
+Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
+https://www.python.org/psf/) was formed, a non-profit organization
+created specifically to own Python-related Intellectual Property.
+Zope Corporation was a sponsoring member of the PSF.
 
 All Python releases are Open Source (see http://www.opensource.org for
 the Open Source Definition).  Historically, most, but not all, Python
@@ -74,8 +73,9 @@ analyze, test, perform and/or display publicly, prepare derivative works,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
 i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are
-retained in Python alone or in any derivative version prepared by Licensee.
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Python Software Foundation;
+All Rights Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make
@@ -180,9 +180,9 @@ version prepared by Licensee.  Alternately, in lieu of CNRI's License
 Agreement, Licensee may substitute the following text (omitting the
 quotes): "Python 1.6.1 is made available subject to the terms and
 conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the Internet using the following
+Python 1.6.1 may be located on the internet using the following
 unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the Internet
+Agreement may also be obtained from a proxy server on the internet
 using the following URL: http://hdl.handle.net/1895.22/1013".
 
 3. In the event Licensee prepares a derivative work that is based on

README.md

@@ -1,29 +1,36 @@
-[![Chat at https://gitter.im/python/typing](https://badges.gitter.im/python/typing.svg)](https://gitter.im/python/typing?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 # Static Typing for Python
 
 ## Documentation and Support
 
 The documentation for Python's static typing can be found at
-[typing.readthedocs.io](https://typing.readthedocs.io/). You can get
-help either in our [support forum](https://github.com/python/typing/discussions) or
-chat with us on [Gitter](https://gitter.im/python/typing).
+[typing.python.org](https://typing.python.org/). You can get
+help in our [support forum](https://github.com/python/typing/discussions).
+
+Improvements to the type system should be discussed on
+[Python's Discourse](https://discuss.python.org/c/typing/32), and are
+tracked in the [issues](https://github.com/python/typing/issues) in this
+repository.
 
-Improvements to the type system should be discussed on the
-[typing-sig](https://mail.python.org/mailman3/lists/typing-sig.python.org/)
-mailing list, although the [issues](https://github.com/python/typing/issues) in this
-repository contain some historic discussions.
+For conversations that are more suitable to a chat platform, you can use one of the following:
+
+- [gitter](https://gitter.im/python/typing)
+- [discord](https://discord.com/channels/267624335836053506/891788761371906108) `#type-hinting` channel
 
 ## Repository Content
 
 This GitHub repository is used for several things:
 
-- The documentation at [typing.readthedocs.io](https://typing.readthedocs.io/)
-  is maintained in the [docs directory](./docs).
+- The documentation at [typing.python.org](https://typing.python.org/)
+  is maintained in the [docs directory](./docs). This includes the
+  [specification](https://typing.python.org/en/latest/spec/index.html) for the
+  type system. See especially [the update procedure](https://typing.python.org/en/latest/spec/meta.html)
+  for the spec.
 
 - A [discussion forum](https://github.com/python/typing/discussions) for typing-related user
   help is hosted here.
 
+- [Conformance test](https://github.com/python/typing/blob/main/conformance/README.md) for Python static type checkers. The [latest conformance test results](https://htmlpreview.github.io/?https://github.com/python/typing/blob/main/conformance/results/results.html) are here.
+
 Historically, this repository also hosted:
 
 - The `typing_extensions` package, which now lives in the

conformance/.gitignore

@@ -0,0 +1,47 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Environments
+.env
+.venv
+
+# Tools
+.mypy_cache
+.pyre_configuration
+.pyre
+.coverage
+htmlcov
+
+# General
+.DS_Store
+
+# Editor temp files
+.*.swp
+
+# Workspace configurations
+.vscode