MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix comparing pre-release numbers (PY-27350)

Browse Source
This commit is contained in:
Semyon Proshev
2018-07-03 14:21:58 +03:00
parent c9cabb1ca2
commit acb29ed2b0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt
+4 -7
View File
@@ -55,15 +55,13 @@ object PyPackageVersionComparator : Comparator<PyPackageVersion> {
/**
* @see PyPackageVersionNormalizer.normalizeEpoch
*/
private fun compareEpochs(o1: PyPackageVersion, o2: PyPackageVersion) = compareAsInts(
o1.epoch ?: "0", o2.epoch ?: "0")
private fun compareEpochs(o1: PyPackageVersion, o2: PyPackageVersion) = compareAsInts(o1.epoch ?: "0", o2.epoch ?: "0")
/**
* @see PyPackageVersionNormalizer.normalizeRelease
*/
private fun compareReleases(o1: PyPackageVersion, o2: PyPackageVersion): PyRequirementRelation {
for ((releasePart1, releasePart2) in zipLongest(o1.release.split('.'),
o2.release.split('.'), "0")) {
for ((releasePart1, releasePart2) in zipLongest(o1.release.split('.'), o2.release.split('.'), "0")) {
if (releasePart1 == "*" || releasePart2 == "*") return PyRequirementRelation.COMPATIBLE
val releaseParts = compareAsInts(releasePart1, releasePart2)
@@ -90,8 +88,7 @@ object PyPackageVersionComparator : Comparator<PyPackageVersion> {
* @see PyPackageVersionNormalizer.normalizePost
*/
private fun comparePosts(o1: PyPackageVersion, o2: PyPackageVersion): Int {
return compareAsInts(o1.post?.substring(4) ?: "-1",
o2.post?.substring(4) ?: "-1")
return compareAsInts(o1.post?.substring(4) ?: "-1", o2.post?.substring(4) ?: "-1")
}
/**
@@ -111,7 +108,7 @@ object PyPackageVersionComparator : Comparator<PyPackageVersion> {
val preTypes = preType1.compareTo(preType2)
if (preTypes != 0) return preTypes
return pre1.substring(preType1.length).compareTo(pre2.substring(preType2.length))
return compareAsInts(pre1.substring(preType1.length), pre2.substring(preType2.length))
}
/**
python/testSrc/com/jetbrains/python/packaging/PyPackageVersionComparatorTest.kt
+4
View File
@@ -42,6 +42,10 @@ class PyPackageVersionComparatorTest : PyTestCase() {
check(normalize("1.2a1"),
normalize("1.2a1"),
normalize("1.2a2"))
check(normalize("1.2a2"),
normalize("1.2a2"),
normalize("1.2a10"))
}
fun testDev() {