diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2019-12-21 02:18:17 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2019-12-21 02:18:26 +0100 |
| commit | 89c36757416e60d22400d1c326251ae04449ab7c (patch) | |
| tree | e5f83ac7b9434fb4a428f85ca0112bc2a1c1d5f7 | |
| parent | 294eb326896e67cee443625c0868c88a578781fe (diff) | |
| download | mitmproxy-89c36757416e60d22400d1c326251ae04449ab7c.tar.gz mitmproxy-89c36757416e60d22400d1c326251ae04449ab7c.tar.bz2 mitmproxy-89c36757416e60d22400d1c326251ae04449ab7c.zip | |
`mitmproxy --version`: incorporate non-annotated tags
| -rw-r--r-- | mitmproxy/version.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_version.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/version.py b/mitmproxy/version.py index 63fb7bf9..82368296 100644 --- a/mitmproxy/version.py +++ b/mitmproxy/version.py @@ -21,7 +21,7 @@ def get_dev_version() -> str: here = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) try: git_describe = subprocess.check_output( - ['git', 'describe', '--long'], + ['git', 'describe', '--tags', '--long'], stderr=subprocess.STDOUT, cwd=here, ) diff --git a/test/mitmproxy/test_version.py b/test/mitmproxy/test_version.py index 924f2d96..c0722537 100644 --- a/test/mitmproxy/test_version.py +++ b/test/mitmproxy/test_version.py @@ -30,5 +30,5 @@ def test_get_version(): m.return_value = b"tag-2-cafecafe" assert version.get_dev_version() == "3.0.0rc2 (+2, commit cafecaf)" - m.side_effect = subprocess.CalledProcessError(-1, 'git describe --long') + m.side_effect = subprocess.CalledProcessError(-1, 'git describe --tags --long') assert version.get_dev_version() == "3.0.0rc2" |