Commits

Anonymous committed 7bf9f47

Fix "dev" versions being considered newer than release candidates.
(backport from trunk)

  • Participants
  • Parent commits 3fa428f
  • Branches setuptools-0.6

Comments (0)

Files changed (3)

File pkg_resources.py

 ).match
 
 component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
-replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c'}.get
+replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c','dev':'@'}.get
 
 def _parse_version_parts(s):
     for part in component_re.split(s):

File pkg_resources.txt

     Finally, to handle miscellaneous cases, the strings "pre", "preview", and
     "rc" are treated as if they were "c", i.e. as though they were release
     candidates, and therefore are not as new as a version string that does not
-    contain them.
+    contain them.  And the string "dev" is treated as if it were an "@" sign;
+    that is, a version coming before even "a" or "alpha".
 
 .. _yield_lines():
 
 Release Notes/Change History
 ----------------------------
 
+0.6c4
+ * Fix "dev" versions being considered newer than release candidates.
+
 0.6c3
  * Python 2.5 compatibility fixes.
 

File setuptools/tests/test_resources.py

         c('0.0.4', '0.4.0')
         c('0pl1', '0.4pl1')
         c('2.1.0-rc1','2.1.0')
+        c('2.1dev','2.1a0')
 
         torture ="""
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1