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.

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

Move versionstring from sydent/snapse to common #22

Merged
merged 10 commits into from
Feb 11, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
96 changes: 96 additions & 0 deletions matrix_common/versionstring.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
# Copyright 2016 OpenMarket Ltd
# Copyright 2021-2022 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import functools
import logging
import subprocess
from typing import Dict

try:
from importlib.metadata import Distribution
except ImportError:
from importlib_metadata import Distribution # type: ignore[misc]

__all__ = ["get_distribution_version_string"]

logger = logging.getLogger(__name__)

version_cache: Dict[str, str] = {}

DMRobertson marked this conversation as resolved.
Show resolved Hide resolved

@functools.lru_cache
clokep marked this conversation as resolved.
Show resolved Hide resolved
def get_distribution_version_string(distribution_name: str) -> str:
"""Calculate a git-aware version string for a distribution package.

A "distribution package" is a thing that you can e.g. install and manage with pip.
It can contain modules, an "import package" of multiple modules, and arbitrary
resource data. See the glossary at

https://packaging.python.org/en/latest/glossary/#term-Distribution-Package

for all your taxonomic needs. Often a distribution package contains exactly import
package---possibly with _different_ names. For example, one can install the
"matrix-sydent" distribution package from PyPI using pip, and doing so makes the
"sydent" import package available to import.

Args:
distribution_name: The name of the distribution package to check the version of

Raises:
importlib.metadata.PackageNotFoundError if the given distribution name doesn't
exist.

Returns:
The module version, possibly with git version information included.
"""

distribution = Distribution.from_name(distribution_name)
clokep marked this conversation as resolved.
Show resolved Hide resolved
version_string = distribution.version
cwd = distribution.locate_file(".")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is locate_file documented?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not in the stdlib docs (which are surprisingly terse?). It is listed in the backport's API reference though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I'm not even sure if it is a backport. Maybe it's a bit like pip --- an external package later vendored into the stdlib?


try:

def _run_git_command(prefix: str, *params: str) -> str:
try:
result = (
subprocess.check_output(
["git", *params], stderr=subprocess.DEVNULL, cwd=cwd
)
.strip()
.decode("ascii")
)
return prefix + result
except (subprocess.CalledProcessError, FileNotFoundError):
return ""

git_branch = _run_git_command("b=", "rev-parse", "--abbrev-ref", "HEAD")
git_tag = _run_git_command("t=", "describe", "--exact-match")
git_commit = _run_git_command("", "rev-parse", "--short", "HEAD")

dirty_string = "-this_is_a_dirty_checkout"
is_dirty = _run_git_command("", "describe", "--dirty=" + dirty_string).endswith(
dirty_string
)
git_dirty = "dirty" if is_dirty else ""

if git_branch or git_tag or git_commit or git_dirty:
git_version = ",".join(
s for s in (git_branch, git_tag, git_commit, git_dirty) if s
)

version_string = f"{version_string} ({git_version})"
except Exception as e:
logger.info("Failed to check for git repository: %s", e)

return version_string
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ packages =
python_requires = >= 3.6
install_requires =
attrs
importlib_metadata >= 1.4; python_version < '3.8'


[options.package_data]
Expand Down