Skip to content

Commit 3812a2b

Browse files
authored
REF: move pre-release version handling to simplify (#924)
1 parent 2948ea1 commit 3812a2b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
def get_proj_version(proj_dir: Path) -> str:
1919
proj_version = os.environ.get("PROJ_VERSION")
2020
if proj_version:
21-
return parse_version(proj_version).base_version
21+
return proj_version
2222
proj = proj_dir / "bin" / "proj"
2323
proj_ver = subprocess.check_output(str(proj), stderr=subprocess.STDOUT).decode(
2424
"ascii"
2525
)
26-
return parse_version((proj_ver.split()[1]).strip(",")).base_version
26+
return (proj_ver.split()[1]).strip(",")
2727

2828

2929
def check_proj_version(proj_version: str) -> None:
@@ -155,7 +155,9 @@ def get_extension_modules():
155155

156156
proj_version = get_proj_version(proj_dir)
157157
check_proj_version(proj_version)
158-
proj_version_major, proj_version_minor, proj_version_patch = proj_version.split(".")
158+
proj_version_major, proj_version_minor, proj_version_patch = parse_version(
159+
proj_version
160+
).base_version.split(".")
159161

160162
# setup extension options
161163
ext_options = {

0 commit comments

Comments
 (0)