From cbb46fe7b6c4f822aa83ece7931607596b2af922 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 31 Jan 2017 01:58:10 +0200 Subject: [PATCH] Fix PEP to SemVer converting --- platformio/maintenance.py | 4 ++-- platformio/util.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio/maintenance.py b/platformio/maintenance.py index cd1e3562..b9ccf050 100644 --- a/platformio/maintenance.py +++ b/platformio/maintenance.py @@ -98,8 +98,8 @@ class Upgrader(object): util.pepver_to_semver(to_version)) self._upgraders = [ - (semantic_version.Version("3.0.0-a1"), self._upgrade_to_3_0_0), - (semantic_version.Version("3.0.0-b11"), self._upgrade_to_3_0_0) + (semantic_version.Version("3.0.0-a.1"), self._upgrade_to_3_0_0), + (semantic_version.Version("3.0.0-b.11"), self._upgrade_to_3_0_0) ] def run(self, ctx): diff --git a/platformio/util.py b/platformio/util.py index b3406dbf..46c11965 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -558,7 +558,7 @@ def where_is_program(program, envpath=None): def pepver_to_semver(pepver): - return re.sub(r"(\.\d+)\.?(dev|a|b|rc|post)", r"\1-\2", pepver, 1) + return re.sub(r"(\.\d+)\.?(dev|a|b|rc|post)", r"\1-\2.", pepver, 1) def rmtree_(path):