Skip to content
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

Fix strange usage of pycbc.version.release #5033

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix strange usage of pycbc.version.release #5033

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions pycbc/results/versioning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@ def add_info_new_version(info_dct, curr_module, extra_str):

pycbcinfo = {}
pycbcinfo['Name'] = 'PyCBC'
pycbcinfo['ID'] = pycbc.version.version
pycbcinfo['ID'] = pycbc.version.git_hash
pycbcinfo['Status'] = pycbc.version.git_status
pycbcinfo['Version'] = pycbc.version.release or ''
pycbcinfo['Version'] = pycbc.version.version
if pycbc.version.release:
pycbcinfo['Version'] += ' (release)'
pycbcinfo['Tag'] = pycbc.version.git_tag
pycbcinfo['Author'] = pycbc.version.git_author
pycbcinfo['Builder'] = pycbc.version.git_builder
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ def __getattr__(self, attr):
except:
vinfo = vdummy()
vinfo.version = '2.8.dev0'
vinfo.release = 'False'
vinfo.release = False

version_script = f"""# coding: utf-8
# Generated by setup.py for PyCBC on {vinfo.build_date}.

# general info
version = '{vinfo.version}'
date = '{vinfo.date}'
release = '{vinfo.release}'
release = {vinfo.release}
last_release = '{vinfo.last_release}'

# git info
Expand Down
Loading