From b052b52a512be714f42aa33bf7f03e2a594545a1 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Thu, 30 Sep 2021 11:46:57 +0200
Subject: [PATCH 01/12] Update remaining versions for third-party stubs

Also remove the python2 markers of packages that don't list Python 2
as supported in the latest version.
---
 stubs/DateTimeRange/METADATA.toml | 3 +--
 stubs/JACK-Client/METADATA.toml   | 2 +-
 stubs/aiofiles/METADATA.toml      | 2 +-
 stubs/contextvars/METADATA.toml   | 2 +-
 stubs/dataclasses/METADATA.toml   | 2 +-
 stubs/decorator/METADATA.toml     | 3 +--
 stubs/frozendict/METADATA.toml    | 2 +-
 stubs/pyRFC3339/METADATA.toml     | 2 +-
 stubs/pycurl/METADATA.toml        | 3 +--
 stubs/tzlocal/METADATA.toml       | 3 +--
 stubs/ujson/METADATA.toml         | 3 +--
 stubs/waitress/METADATA.toml      | 2 +-
 12 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/stubs/DateTimeRange/METADATA.toml b/stubs/DateTimeRange/METADATA.toml
index 1fbfc0a8e92d..8bc1ccfcb192 100644
--- a/stubs/DateTimeRange/METADATA.toml
+++ b/stubs/DateTimeRange/METADATA.toml
@@ -1,3 +1,2 @@
-version = "0.1"
-python2 = true
+version = "1.2"
 requires = ["types-python-dateutil"]
diff --git a/stubs/JACK-Client/METADATA.toml b/stubs/JACK-Client/METADATA.toml
index 5f1541084942..c0ca2875e6a9 100644
--- a/stubs/JACK-Client/METADATA.toml
+++ b/stubs/JACK-Client/METADATA.toml
@@ -1 +1 @@
-version = "0.1"
+version = "0.5"
diff --git a/stubs/aiofiles/METADATA.toml b/stubs/aiofiles/METADATA.toml
index 40f3c61c10ae..3351d8842eb9 100644
--- a/stubs/aiofiles/METADATA.toml
+++ b/stubs/aiofiles/METADATA.toml
@@ -1,2 +1,2 @@
-version = "0.1"
+version = "0.7"
 requires = []
diff --git a/stubs/contextvars/METADATA.toml b/stubs/contextvars/METADATA.toml
index 5f1541084942..ea07e8d318f6 100644
--- a/stubs/contextvars/METADATA.toml
+++ b/stubs/contextvars/METADATA.toml
@@ -1 +1 @@
-version = "0.1"
+version = "2.4"
diff --git a/stubs/dataclasses/METADATA.toml b/stubs/dataclasses/METADATA.toml
index 5f1541084942..20ce04992fc8 100644
--- a/stubs/dataclasses/METADATA.toml
+++ b/stubs/dataclasses/METADATA.toml
@@ -1 +1 @@
-version = "0.1"
+version = "0.8"
diff --git a/stubs/decorator/METADATA.toml b/stubs/decorator/METADATA.toml
index 31f638bf33df..d9c259fcaac5 100644
--- a/stubs/decorator/METADATA.toml
+++ b/stubs/decorator/METADATA.toml
@@ -1,2 +1 @@
-version = "0.1"
-python2 = true
+version = "5.1"
diff --git a/stubs/frozendict/METADATA.toml b/stubs/frozendict/METADATA.toml
index 5f1541084942..36c6ece542ea 100644
--- a/stubs/frozendict/METADATA.toml
+++ b/stubs/frozendict/METADATA.toml
@@ -1 +1 @@
-version = "0.1"
+version = "2.0"
diff --git a/stubs/pyRFC3339/METADATA.toml b/stubs/pyRFC3339/METADATA.toml
index 5f1541084942..bad265e4fe3f 100644
--- a/stubs/pyRFC3339/METADATA.toml
+++ b/stubs/pyRFC3339/METADATA.toml
@@ -1 +1 @@
-version = "0.1"
+version = "1.1"
diff --git a/stubs/pycurl/METADATA.toml b/stubs/pycurl/METADATA.toml
index 31f638bf33df..4dadd732eb83 100644
--- a/stubs/pycurl/METADATA.toml
+++ b/stubs/pycurl/METADATA.toml
@@ -1,2 +1 @@
-version = "0.1"
-python2 = true
+version = "7.44"
diff --git a/stubs/tzlocal/METADATA.toml b/stubs/tzlocal/METADATA.toml
index 43a3246aeece..309661e3eeac 100644
--- a/stubs/tzlocal/METADATA.toml
+++ b/stubs/tzlocal/METADATA.toml
@@ -1,3 +1,2 @@
-version = "0.1"
-python2 = true
+version = "3.0"
 requires = ["types-pytz"]
diff --git a/stubs/ujson/METADATA.toml b/stubs/ujson/METADATA.toml
index 31f638bf33df..de720977e07a 100644
--- a/stubs/ujson/METADATA.toml
+++ b/stubs/ujson/METADATA.toml
@@ -1,2 +1 @@
-version = "0.1"
-python2 = true
+version = "4.2"
diff --git a/stubs/waitress/METADATA.toml b/stubs/waitress/METADATA.toml
index 40f3c61c10ae..677c0e062187 100644
--- a/stubs/waitress/METADATA.toml
+++ b/stubs/waitress/METADATA.toml
@@ -1,2 +1,2 @@
-version = "0.1"
+version = "2.0"
 requires = []

From 4eeef0fe1811d4607fb2e77bfd57a70f8eaae79f Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Thu, 30 Sep 2021 12:23:51 +0200
Subject: [PATCH 02/12] Don't special case version '0.1'

---
 tests/stubtest_third_party.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/stubtest_third_party.py b/tests/stubtest_third_party.py
index 0cbe2728af77..d68e12148a90 100755
--- a/tests/stubtest_third_party.py
+++ b/tests/stubtest_third_party.py
@@ -48,10 +48,8 @@ def run_stubtest(dist: Path) -> None:
         python_exe = str(venv_dir / "bin" / "python")
 
         dist_version = metadata.get("version")
-        if dist_version is None or dist_version == "0.1":
-            dist_req = dist.name
-        else:
-            dist_req = f"{dist.name}=={dist_version}.*"
+        assert dist_version is not None
+        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"

From 8516c57999d494f58f7a7cc145f9d5fd55b33267 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Thu, 30 Sep 2021 13:32:47 +0200
Subject: [PATCH 03/12] Update CONTRIBUTING

---
 CONTRIBUTING.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c1025c3b7425..15d149e03523 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,9 +101,7 @@ supported:
   of [Semantic Versioning](https://semver.org/) that is the first two
   components. 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

From 4861b89ac89834f0a7b1f6a89a336fa0b8928e50 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Thu, 30 Sep 2021 13:53:26 +0200
Subject: [PATCH 04/12] Reduce dataclasses version to '0' for now

---
 stubs/dataclasses/METADATA.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/dataclasses/METADATA.toml b/stubs/dataclasses/METADATA.toml
index 20ce04992fc8..87c44844fdb4 100644
--- a/stubs/dataclasses/METADATA.toml
+++ b/stubs/dataclasses/METADATA.toml
@@ -1 +1 @@
-version = "0.8"
+version = "0"

From 5b4070e12ae3815fd506b581a9ebf86ae6eb4958 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Thu, 30 Sep 2021 14:07:13 +0200
Subject: [PATCH 05/12] Allow single-digit version numbers

---
 tests/check_consistent.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/check_consistent.py b/tests/check_consistent.py
index a29c71f40bdd..5e4e45545902 100755
--- a/tests/check_consistent.py
+++ b/tests/check_consistent.py
@@ -169,7 +169,7 @@ 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+(\.\d+)?$", version), msg
+        assert re.match(r"^\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}"

From 5abce344766b0483ea4b81188f8898ec7fa65916 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Mon, 11 Oct 2021 11:15:01 +0200
Subject: [PATCH 06/12] Set dataclasses version to 0.8

---
 stubs/dataclasses/METADATA.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/dataclasses/METADATA.toml b/stubs/dataclasses/METADATA.toml
index 87c44844fdb4..20ce04992fc8 100644
--- a/stubs/dataclasses/METADATA.toml
+++ b/stubs/dataclasses/METADATA.toml
@@ -1 +1 @@
-version = "0"
+version = "0.8"

From 01c906353dd1d6741748fb98a58f7134ea137844 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Mon, 11 Oct 2021 11:19:16 +0200
Subject: [PATCH 07/12] Update CONTRIBUTING.md

Co-authored-by: Akuli <akuviljanen17@gmail.com>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ffe705069c3..576809ebeec9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -103,7 +103,7 @@ supported:
   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).
-  Other stubs don't use the asterisk to denote the API-independent part.
+  Some stubs don't use the asterisk to denote the API-independent part.
 * `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

From c32e0f0f483aaaa1f816dec08ebbab546454e632 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Tue, 12 Oct 2021 11:17:29 +0200
Subject: [PATCH 08/12] Versions must have at least two components

---
 tests/check_consistent.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/check_consistent.py b/tests/check_consistent.py
index c6f9ff51425d..3f91efaac849 100755
--- a/tests/check_consistent.py
+++ b/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.match(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}"

From af08be7a9778cf3bb0eb881a89ff5296c6f62373 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Tue, 12 Oct 2021 11:21:35 +0200
Subject: [PATCH 09/12] Use star versions where applicable

---
 stubs/DateTimeRange/METADATA.toml | 2 +-
 stubs/JACK-Client/METADATA.toml   | 2 +-
 stubs/decorator/METADATA.toml     | 2 +-
 stubs/frozendict/METADATA.toml    | 2 +-
 stubs/pycurl/METADATA.toml        | 2 +-
 stubs/ujson/METADATA.toml         | 2 +-
 stubs/waitress/METADATA.toml      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stubs/DateTimeRange/METADATA.toml b/stubs/DateTimeRange/METADATA.toml
index 8bc1ccfcb192..f522021080f9 100644
--- a/stubs/DateTimeRange/METADATA.toml
+++ b/stubs/DateTimeRange/METADATA.toml
@@ -1,2 +1,2 @@
-version = "1.2"
+version = "1.2.*"
 requires = ["types-python-dateutil"]
diff --git a/stubs/JACK-Client/METADATA.toml b/stubs/JACK-Client/METADATA.toml
index c0ca2875e6a9..1883b870198a 100644
--- a/stubs/JACK-Client/METADATA.toml
+++ b/stubs/JACK-Client/METADATA.toml
@@ -1 +1 @@
-version = "0.5"
+version = "0.5.*"
diff --git a/stubs/decorator/METADATA.toml b/stubs/decorator/METADATA.toml
index d9c259fcaac5..2c151642b36f 100644
--- a/stubs/decorator/METADATA.toml
+++ b/stubs/decorator/METADATA.toml
@@ -1 +1 @@
-version = "5.1"
+version = "5.1.*"
diff --git a/stubs/frozendict/METADATA.toml b/stubs/frozendict/METADATA.toml
index 36c6ece542ea..58bc38349459 100644
--- a/stubs/frozendict/METADATA.toml
+++ b/stubs/frozendict/METADATA.toml
@@ -1 +1 @@
-version = "2.0"
+version = "2.0.*"
diff --git a/stubs/pycurl/METADATA.toml b/stubs/pycurl/METADATA.toml
index 4dadd732eb83..fafbc99588cb 100644
--- a/stubs/pycurl/METADATA.toml
+++ b/stubs/pycurl/METADATA.toml
@@ -1 +1 @@
-version = "7.44"
+version = "7.44.*"
diff --git a/stubs/ujson/METADATA.toml b/stubs/ujson/METADATA.toml
index de720977e07a..cb7498d03056 100644
--- a/stubs/ujson/METADATA.toml
+++ b/stubs/ujson/METADATA.toml
@@ -1 +1 @@
-version = "4.2"
+version = "4.2.*"
diff --git a/stubs/waitress/METADATA.toml b/stubs/waitress/METADATA.toml
index 677c0e062187..a035bd0a01ba 100644
--- a/stubs/waitress/METADATA.toml
+++ b/stubs/waitress/METADATA.toml
@@ -1,2 +1,2 @@
-version = "2.0"
+version = "2.0.*"
 requires = []

From 549042593a43285ba5b69bf2e4e6f77fa6fd59f5 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Tue, 12 Oct 2021 11:22:20 +0200
Subject: [PATCH 10/12] Use star version for aiofiles

---
 stubs/aiofiles/METADATA.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/aiofiles/METADATA.toml b/stubs/aiofiles/METADATA.toml
index 3351d8842eb9..6b8eeefb1769 100644
--- a/stubs/aiofiles/METADATA.toml
+++ b/stubs/aiofiles/METADATA.toml
@@ -1,2 +1,2 @@
-version = "0.7"
+version = "0.7.*"
 requires = []

From 88295cfd7b06e4ff9819071d989040fcba829a75 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Tue, 12 Oct 2021 11:53:34 +0200
Subject: [PATCH 11/12] Downgrade dataclasses version

The latest version available on PyPI is 0.8, but for some reason that is
uninstallable.
---
 stubs/dataclasses/METADATA.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/dataclasses/METADATA.toml b/stubs/dataclasses/METADATA.toml
index 20ce04992fc8..22cbe4eb9ca3 100644
--- a/stubs/dataclasses/METADATA.toml
+++ b/stubs/dataclasses/METADATA.toml
@@ -1 +1 @@
-version = "0.8"
+version = "0.6"

From 39b6fe1765d5a2a9959d713bacb4e685a057e75e Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Tue, 12 Oct 2021 12:19:21 +0200
Subject: [PATCH 12/12] Update tests/check_consistent.py

Co-authored-by: Akuli <akuviljanen17@gmail.com>
---
 tests/check_consistent.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/check_consistent.py b/tests/check_consistent.py
index 3f91efaac849..2f7192bd8b2b 100755
--- a/tests/check_consistent.py
+++ b/tests/check_consistent.py
@@ -170,7 +170,7 @@ def check_metadata():
         version = data["version"]
         msg = f"Unsupported Python version {version}"
         assert isinstance(version, str), msg
-        assert re.match(r"^(\d+(\.\d+)+|\d+(\.\d+)*\.\*)$", version), 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}"