Skip to content

Commit d842b97

Browse files
committed
Feat: only support prereleases
1 parent 2e44479 commit d842b97

File tree

3 files changed

+9
-51
lines changed

3 files changed

+9
-51
lines changed

hatch_nodejs_version/version_source.py

Lines changed: 9 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,6 @@
2323
[-\.]?
2424
(?P<pre_n>[0-9]+)?
2525
)?
26-
(?P<post> # post release
27-
(?:-(?P<post_n1>[0-9]+))
28-
|
29-
(?:
30-
[-\.]?
31-
(?P<post_l>post|rev|r)
32-
[-\.]?
33-
(?P<post_n2>[0-9]+)?
34-
)
35-
)?
36-
(?P<dev> # dev release
37-
[-\.]?
38-
(?P<dev_l>dev)
39-
[-\.]?
40-
(?P<dev_n>[0-9]+)?
41-
)?
4226
"""
4327

4428
# The NodeJS-aware Python version regex
@@ -59,22 +43,6 @@
5943
[-_\.]?
6044
(?P<pre_n>[0-9]+)?
6145
)?
62-
(?P<post> # post release
63-
(?:-(?P<post_n1>[0-9]+))
64-
|
65-
(?:
66-
[-_\.]?
67-
(?P<post_l>post|rev|r)
68-
[-_\.]?
69-
(?P<post_n2>[0-9]+)?
70-
)
71-
)?
72-
(?P<dev> # dev release
73-
[-_\.]?
74-
(?P<dev_l>dev)
75-
[-_\.]?
76-
(?P<dev_n>[0-9]+)?
77-
)?
7846
)
7947
"""
8048

@@ -96,13 +64,10 @@ def node_version_to_python(self, version: str) -> str:
9664
parts = ["{major}.{minor}.{patch}".format_map(match)]
9765

9866
if match["pre"]:
99-
parts.append("{pre_l}{pre_n}".format_map(match))
100-
if match["post_n1"]:
101-
parts.append(".post{post_n1}".format_map(match))
102-
elif match["post_l"]:
103-
parts.append(".{post_l}{post_n2}".format_map(match))
104-
if match["dev"]:
105-
parts.append("{dev_l}{dev_n}".format_map(match))
67+
if match["pre_n"] is None:
68+
parts.append("{pre_l}".format_map(match))
69+
else:
70+
parts.append("{pre_l}{pre_n}".format_map(match))
10671

10772
return "".join(parts)
10873

@@ -115,22 +80,15 @@ def python_version_to_node(self, version: str) -> str:
11580
re.VERBOSE | re.IGNORECASE,
11681
)
11782
if match is None:
118-
raise ValueError(f"Version {node_version!r} did not match regex")
83+
raise ValueError(f"Version {version!r} did not match regex")
11984

12085
parts = ["{major}.{minor}.{patch}".format_map(match)]
12186

122-
pre_parts = []
12387
if match["pre"]:
124-
pre_parts.append("{pre_l}{pre_n}".format_map(match))
125-
if match["post_n1"]:
126-
pre_parts.append(".post{post_n1}".format_map(match))
127-
elif match["post_l"]:
128-
pre_parts.append(".{post_l}{post_n2}".format_map(match))
129-
if match["dev"]:
130-
pre_parts.append("{dev_l}{dev_n}".format_map(match))
131-
132-
if pre_parts:
133-
parts.append("-" + "".join(pre_parts))
88+
if match["pre_n"] is None:
89+
parts.append("-{pre_l}".format_map(match))
90+
else:
91+
parts.append("-{pre_l}{pre_n}".format_map(match))
13492

13593
return "".join(parts)
13694

tests/conftest.py

Whitespace-only changes.

tests/test_version_config.py

Whitespace-only changes.

0 commit comments

Comments
 (0)