Update remaining versions for third-party stubs (#6094)

Also remove the python2 markers of packages that don't list Python 2
as supported in the latest version.

Don't special case version '0.1'

Co-authored-by: Akuli <[email protected]>

Author: srittau

CONTRIBUTING.md

@@ -95,16 +95,18 @@ The metadata file describes the stubs package using the
 [TOML file format](https://toml.io/en/). Currently, the following keys are
 supported:
 
-* `version`: The versions of the library that the stubs support.
-  For libraries that reflect API changes in the version number only
-  the parts indicating the API level should be specified, with an
-  asterisk representing the API-independent part. In the case
-  of [Semantic Versioning](https://semver.org/), this version could look
-  like this: `2.7.*`. When the stubs are updated to a newer version
+* `version`: The versions of the library that the stubs support. Two
+  formats are supported:
+    - A concrete version. This is especially suited for libraries that
+      use [Calendar Versioning](https://calver.org/).
+    - A version range ending in `.*`. This is suited for libraries that
+      reflect API changes in the version number only, where the API-independent
+      part is represented by the asterisk. In the case
+      of [Semantic Versioning](https://semver.org/), this version could look
+      like this: `2.7.*`.
+  When the stubs are updated to a newer version
   of the library, the version of the stub should be bumped (note that
-  previous versions are still available on PyPI). Some legacy stubs are
-  marked with version `0.1`, indicating that their supported version is
-  unknown and needs to be updated.
+  previous versions are still available on PyPI).
 * `python2` (default: `false`): If set to `true`, the top-level stubs
   support both Python 2 and Python 3.
 * `requires` (optional): A list of other stub packages or packages with type

stubs/DateTimeRange/METADATA.toml

@@ -1,3 +1,2 @@
-version = "0.1"
-python2 = true
+version = "1.2.*"
 requires = ["types-python-dateutil"]

stubs/JACK-Client/METADATA.toml

@@ -1 +1 @@
-version = "0.1"
+version = "0.5.*"

stubs/aiofiles/METADATA.toml

@@ -1,2 +1,2 @@
-version = "0.1"
+version = "0.7.*"
 requires = []

stubs/contextvars/METADATA.toml

@@ -1 +1 @@
-version = "0.1"
+version = "2.4"

stubs/dataclasses/METADATA.toml

@@ -1 +1 @@
-version = "0.1"
+version = "0.6"

stubs/decorator/METADATA.toml

@@ -1,2 +1 @@
-version = "0.1"
-python2 = true
+version = "5.1.*"

stubs/frozendict/METADATA.toml

@@ -1 +1 @@
-version = "0.1"
+version = "2.0.*"

stubs/pyRFC3339/METADATA.toml

@@ -1 +1 @@
-version = "0.1"
+version = "1.1"

stubs/pycurl/METADATA.toml

@@ -1,2 +1 @@
-version = "0.1"
-python2 = true
+version = "7.44.*"

stubs/tzlocal/METADATA.toml

@@ -1,3 +1,2 @@
-version = "0.1"
-python2 = true
+version = "3.0"
 requires = ["types-pytz"]

stubs/ujson/METADATA.toml

@@ -1,2 +1 @@
-version = "0.1"
-python2 = true
+version = "4.2.*"

stubs/waitress/METADATA.toml

@@ -1,2 +1,2 @@
-version = "0.1"
+version = "2.0.*"
 requires = []

tests/check_consistent.py

@@ -169,7 +169,8 @@ def check_metadata():
         assert "version" in data, f"Missing version for {distribution}"
         version = data["version"]
         msg = f"Unsupported Python version {version}"
-        assert re.match(r"^\d+(\.\d+)*(\.\*)?$", version), msg
+        assert isinstance(version, str), msg
+        assert re.fullmatch(r"\d+(\.\d+)+|\d+(\.\d+)*\.\*", version), msg
         for key in data:
             assert key in metadata_keys, f"Unexpected key {key} for {distribution}"
         assert isinstance(data.get("python2", False), bool), f"Invalid python2 value for {distribution}"

tests/stubtest_third_party.py

@@ -49,10 +49,7 @@ def run_stubtest(dist: Path) -> None:
 
         dist_version = metadata["version"]
         assert isinstance(dist_version, str)
-        if dist_version == "0.1":
-            dist_req = dist.name
-        else:
-            dist_req = f"{dist.name}=={dist_version}"
+        dist_req = f"{dist.name}=={dist_version}"
 
         # If @tests/requirements-stubtest.txt exists, run "pip install" on it.
         req_path = dist / "@tests" / "requirements-stubtest.txt"