Normalise version strings

Author: molinav

packages/basemap/src/_geoslib.pyx

@@ -2,7 +2,7 @@ import sys
 import numpy
 cimport numpy as cnp
 
-__version__ = "2.0.0-dev"
+__version__ = "2.0.0.dev0"
 
 
 # Need some Python C-API functions for strings.

packages/basemap/src/mpl_toolkits/basemap/__init__.py

@@ -48,7 +48,7 @@
 from . proj import Proj
 
 
-__version__ = "2.0.0-dev"
+__version__ = "2.0.0.dev0"
 
 # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
 # check to see if environment variable BASEMAPDATA set to a directory,

packages/basemap/test/mpl_toolkits/test_basemap.py

@@ -14,8 +14,8 @@ def test_version_attribute(self):
         basemap_version = basemap.__version__
 
         num = r"(?:0|[1-9]\d*)"
-        build = r"(?:dev|a[1-4]|b[1-3]|rc[1-2])"
-        semver = r"^({0}\.{0}\.{0})(?:[+-]?({1}))?$".format(num, build)
+        build = r"(?:dev[0]?|a[1-4]|b[1-3]|rc[1-2])"
+        semver = r"^({0}\.{0}\.{0})(?:[+-\.]?({1}))?$".format(num, build)
         self.assertRegex(basemap_version, semver)
 
 

packages/basemap_data/setup.py

@@ -73,7 +73,7 @@ def get_content(name, splitlines=False):
     "name":
         "basemap_data",
     "version":
-        "2.0.0-dev",
+        "2.0.0.dev0",
     "description":
         "Data assets for matplotlib basemap",
     "long_description":

packages/basemap_data_hires/setup.py

@@ -51,7 +51,7 @@ def get_content(name, splitlines=False):
     "name":
         "basemap_data_hires",
     "version":
-        "2.0.0-dev",
+        "2.0.0.dev0",
     "description":
         "High-resolution data assets for matplotlib basemap",
     "long_description":