Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Stephan Seitz
pystencils
Commits
dba69a74
Commit
dba69a74
authored
Feb 22, 2020
by
Martin Bauer
Browse files
Fixes when determining version from git tag
- corrected sorting 0.2.10 > 0.2.2
parent
6c1ee87a
Pipeline
#22142
passed with stage
in 11 minutes and 4 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
doc/version_from_git.py
View file @
dba69a74
import
subprocess
import
subprocess
from
distutils.version
import
StrictVersion
def
version_number_from_git
(
tag_prefix
=
'release/'
,
sha_length
=
10
,
version_format
=
"{version}.dev{commits}+{sha}"
):
def
version_number_from_git
(
tag_prefix
=
'release/'
,
sha_length
=
10
,
version_format
=
"{version}.dev{commits}+{sha}"
):
def
get_released_versions
():
def
get_released_versions
():
tags
=
sorted
(
subprocess
.
getoutput
(
'git tag'
).
split
(
'
\n
'
))
tags
=
sorted
(
subprocess
.
getoutput
(
'git tag'
).
split
(
'
\n
'
))
versions
=
[
t
[
len
(
tag_prefix
):]
for
t
in
tags
if
t
.
startswith
(
tag_prefix
)]
versions
=
[
t
[
len
(
tag_prefix
):]
for
t
in
tags
if
t
.
startswith
(
tag_prefix
)]
...
@@ -15,7 +16,9 @@ def version_number_from_git(tag_prefix='release/', sha_length=10, version_format
...
@@ -15,7 +16,9 @@ def version_number_from_git(tag_prefix='release/', sha_length=10, version_format
parsed_version
[
-
1
]
+=
1
parsed_version
[
-
1
]
+=
1
return
'.'
.
join
(
str
(
i
)
for
i
in
parsed_version
)
return
'.'
.
join
(
str
(
i
)
for
i
in
parsed_version
)
latest_release
=
get_released_versions
()[
-
1
]
version_strings
=
get_released_versions
()
version_strings
.
sort
(
key
=
StrictVersion
)
latest_release
=
version_strings
[
-
1
]
commits_since_tag
=
subprocess
.
getoutput
(
'git rev-list {}..HEAD --count'
.
format
(
tag_from_version
(
latest_release
)))
commits_since_tag
=
subprocess
.
getoutput
(
'git rev-list {}..HEAD --count'
.
format
(
tag_from_version
(
latest_release
)))
sha
=
subprocess
.
getoutput
(
'git rev-parse HEAD'
)[:
sha_length
]
sha
=
subprocess
.
getoutput
(
'git rev-parse HEAD'
)[:
sha_length
]
is_dirty
=
len
(
subprocess
.
getoutput
(
"git status --untracked-files=no -s"
))
>
0
is_dirty
=
len
(
subprocess
.
getoutput
(
"git status --untracked-files=no -s"
))
>
0
...
...
release.sh
View file @
dba69a74
...
@@ -8,6 +8,6 @@ read new_version
...
@@ -8,6 +8,6 @@ read new_version
git tag
-s
release/
${
new_version
}
git tag
-s
release/
${
new_version
}
git push origin master release/
${
new_version
}
git push origin master release/
${
new_version
}
python setup.py sdist bdist_wheel
rm
-rf
dist
rm
-rf
dist
python setup.py sdist
twine upload dist/
*
twine upload dist/
*
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment