Make the version check PEP440-compliant

[jroelofs]

Summary

rdar://91296762

[thopre]

Is the change about handling cases where the project name is something that would not be valid for parse_version? Could you detail the commit message a little bit to explain what is currently not compliant?

[jroelofs]

This showed up in one of our buildbots:

++ lnt check-no-errors lnt-submission.json
lib/python3.8/site-packages/pkg_resources/__init__.py:122: PkgResourcesDeprecationWarning: LNT 0.4.2.dev0 is an invalid version and will not be supported in a future release
  warnings.warn(
++ echo @@@@@@@
@@@@@@@

[thopre]

In D123227#3433836, @jroelofs wrote:

This showed up in one of our buildbots:

++ lnt check-no-errors lnt-submission.json
lib/python3.8/site-packages/pkg_resources/__init__.py:122: PkgResourcesDeprecationWarning: LNT 0.4.2.dev0 is an invalid version and will not be supported in a future release
  warnings.warn(
++ echo @@@@@@@
@@@@@@@

Ah right so I suggest a description along the liens of:

Call parse_version on the LNT version only to be PEP 440 compliant. Better wording welcome. LGTM with a better description

[cmatthews]

Looks good, with the suggested commit message change.

[jroelofs]

Seems I don't have permissions on the repo to commit this.

[thopre]

In D123227#3434107, @jroelofs wrote:

Seems I don't have permissions on the repo to commit this.

I can commit for you. Are you happy with the commit description I proposed?

[jroelofs]

sounds good to me, thank you!

[thopre]

This comment has been deleted.

lnt/lnttool/main.py

474

I've fixed some C++ism when applying the patch or many tests were failing.

[jroelofs]

lnt/lnttool/main.py

474

Good catch, thanks!

lnt/lnttool/main.py

def _version_check():
     when the version number changes (which may involve changing package
     requirements).
     """
     import pkg_resources
     import lnt
 
     # Get the current distribution.
     installed_dist = pkg_resources.get_distribution("LNT")
-    installed_dist_name = "%s %s" % (installed_dist.project_name,
-                                     installed_dist.version)
-    current_dist_name = "LNT %s" % (lnt.__version__,)
-    if pkg_resources.parse_version(installed_dist_name) != \
-       pkg_resources.parse_version(current_dist_name):
+    if installed_dist.project_name != "LNT" || \
+       pkg_resources.parse_version(installed_dist.version) != \
+       pkg_resources.parse_version(lnt.__version__):
         raise SystemExit("""\
-error: installed distribution %s is not current (%s), you may need to reinstall
+error: installed distribution %s %s is not current (%s %s), you may need to reinstall
 LNT or rerun 'setup.py develop' if using development mode.""" % (
-                         installed_dist_name, current_dist_name))
+                         installed_dist.project_name,
+                         installed_dist.version,
+                         "LNT", lnt.__version__))
 
 
 def show_version(ctx, param, value):
     """print LNT version"""
     import lnt
     if not value or ctx.resilient_parsing:
         return
     if lnt.__version__: