Skip to content

REF: move pre-release version handling to simplify #924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2021
Merged

REF: move pre-release version handling to simplify #924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
def get_proj_version(proj_dir: Path) -> str:
proj_version = os.environ.get("PROJ_VERSION")
if proj_version:
return parse_version(proj_version).base_version
return proj_version
proj = proj_dir / "bin" / "proj"
proj_ver = subprocess.check_output(str(proj), stderr=subprocess.STDOUT).decode(
"ascii"
)
return parse_version((proj_ver.split()[1]).strip(",")).base_version
return (proj_ver.split()[1]).strip(",")


def check_proj_version(proj_version: str) -> None:
Expand Down Expand Up @@ -155,7 +155,9 @@ def get_extension_modules():

proj_version = get_proj_version(proj_dir)
check_proj_version(proj_version)
proj_version_major, proj_version_minor, proj_version_patch = proj_version.split(".")
proj_version_major, proj_version_minor, proj_version_patch = parse_version(
proj_version
).base_version.split(".")

# setup extension options
ext_options = {
Expand Down