Skip to content

Commit

Permalink
Another version number detection fix
Browse files Browse the repository at this point in the history
  • Loading branch information
FormerLurker committed Jun 2, 2020
1 parent 098ad56 commit 99dd19f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions octoprint_octolapse_setuptools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,4 @@ def clean_version(version):
return version


def custom_version_compare(a,b):
return NumberedVersion(a) >= NumberedVersion(b)




2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# This can happen if the user installs from one of the .zip links in github, not generated with git archive
fallback_version = NumberedVersion.clean_version("0.4.0rc3")
# Get the cleaned version number from versioneer
plugin_version = NumberedVersion.clean_version(versioneer.get_version())
plugin_version = NumberedVersion.clean_version(versioneer.get_versions(verbose=True)["version"])

# Depending on the installation method, versioneer might not know the current version
# if plugin_version == "0+unknown" or NumberedVersion(plugin_version) < NumberedVersion(fallback_version):
Expand Down

0 comments on commit 99dd19f

Please sign in to comment.