Skip to content

Commit

Permalink
Merge pull request #918 from PCMDI/lee1043-patch-1
Browse files Browse the repository at this point in the history
Update setup.py
  • Loading branch information
lee1043 committed Apr 7, 2023
2 parents 6e562f6 + 6927b82 commit fb960ed
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pcmdi_metrics/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = 'v3.0.1'
__git_tag_describe__ = 'v3.0.1'
__git_sha1__ = '5f26713a589f99e30f3ee36655f6c1311fc724b8'
__version__ = 'v3.0.2'
__git_tag_describe__ = 'v3.0.2-4-g110dcf50'
__git_sha1__ = '110dcf50d933e099ee063c8b0a64644635d0af12'
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@
else:
install_dev = False

release_version = "3.0.1"
release_version = "3.0.2"

p = subprocess.Popen(
("git", "describe", "--tags"),
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)

"""
try:
descr = p.stdout.readlines()[0].strip().decode("utf-8")
Version = "-".join(descr.split("-")[:-2])
Expand All @@ -44,6 +46,7 @@
print("__git_tag_describe__ = '%s'" % descr, file=f)
print("__git_sha1__ = '%s'" % commit, file=f)
f.close()
"""

# Generate and install default arguments
p = subprocess.Popen(["python", "setup_default_args.py"], cwd="share")
Expand Down

0 comments on commit fb960ed

Please sign in to comment.