laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/41738?usp=email )
Change subject: pySim-shell: renovate version command
......................................................................
pySim-shell: renovate version command
In case pySim-shell is used directly from the git repository (not
installed via a package manager), the version command fails with an
exception because pkg_resources.get_distribution('pySim') fails.
Let's renovate the version command and migrate from pkg_resources to
importlib.resources. There are many users and developers out there who
retrieve pySim-shell directly from the git repository and not via pip3.
To accommodate for that, let's check if pySim-shell.py is located in a
git repository and if so, let's display the HEAD commit hash instead.
Since the version of the currently installed pyosmocom version also
plays a critical role, let's display the pyosmocom version as well.
Related: OS#6830
Change-Id: I2b9038f88cfcaa07894a2f09c7f5ad8a5474083d
---
M pySim-shell.py
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/pySim-shell.py b/pySim-shell.py
index da3a26b..56fba7b 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -519,8 +519,17 @@
@cmd2.with_category(CUSTOM_CATEGORY)
def do_version(self, opts):
"""Print the pySim software version."""
- import pkg_resources
- self.poutput(pkg_resources.get_distribution('pySim'))
+ from importlib.metadata import version as vsn
+ self.poutput("pyosmocom " + vsn('pyosmocom'))
+ import os
+ cwd = os.path.dirname(os.path.realpath(__file__))
+ if os.path.isdir(os.path.join(cwd, ".git")):
+ import subprocess
+ url = subprocess.check_output(['git', 'config', '--get',
'remote.origin.url']).decode('ascii').strip()
+ version = subprocess.check_output(['git', 'rev-parse', 'HEAD'],
cwd=cwd).decode('ascii').strip()
+ self.poutput(os.path.basename(url) + " " + version)
+ else:
+ self.poutput("pySim " + vsn('pySim'))
@with_default_category('pySim Commands')
class PySimCommands(CommandSet):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/41738?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I2b9038f88cfcaa07894a2f09c7f5ad8a5474083d
Gerrit-Change-Number: 41738
Gerrit-PatchSet: 7
Gerrit-Owner: dexter <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
