Improves package collection for SAT (#1416)

* Improves the special version tests so it includes run and custom actions.

* disables all suites except requires to iterate quicker

* removes fake tesst

* remove test

* reenables suites. Changes the way special versions are collected

Author: jmgomez

src/nimblepkg/nimblesat.nim

@@ -125,8 +125,13 @@ proc getMinimalInfo*(nimbleFile: string, pkgName: string, options: Options): Pac
 
 proc hasVersion*(packageVersions: PackageVersions, pv: PkgTuple): bool =
   for pkg in packageVersions.versions:
-    if pkg.name == pv.name and pkg.version.withinRange(pv.ver):
-      return true
+    if pkg.name == pv.name:
+      # Special versions must match exactly for collection purposes
+      if pv.ver.kind == verSpecial:
+        return $pkg.version == $pv.ver
+      # Regular version ranges
+      elif pkg.version.withinRange(pv.ver):
+        return true
   false
 
 proc hasVersion*(packagesVersions: Table[string, PackageVersions], pv: PkgTuple): bool =
@@ -657,21 +662,31 @@ proc getMinimalFromPreferred(pv: PkgTuple,  getMinimalPackage: GetPackageMinimal
       return @[pp]
   getMinimalPackage(pv, options)
 
-proc processRequirements(versions: var Table[string, PackageVersions], pv: PkgTuple, visited: var HashSet[PkgTuple],  getMinimalPackage: GetPackageMinimal, preferredPackages: seq[PackageMinimalInfo] = newSeq[PackageMinimalInfo](), options: Options) =
+proc processRequirements(versions: var Table[string, PackageVersions], pv: PkgTuple, visited: var HashSet[PkgTuple], getMinimalPackage: GetPackageMinimal, preferredPackages: seq[PackageMinimalInfo] = newSeq[PackageMinimalInfo](), options: Options) =
   if pv in visited:
     return
 
   visited.incl pv
 
-  if not hasVersion(versions, pv):
+  # For special versions, always process them even if we think we have the package
+  # This ensures the special version gets downloaded and added to the version table
+  if pv.ver.kind == verSpecial or not hasVersion(versions, pv):
     var pkgMins = getMinimalFromPreferred(pv, getMinimalPackage, preferredPackages, options)
     for pkgMin in pkgMins.mitems:
       if pv.ver.kind == verSpecial:
         pkgMin.version = newVersion $pv.ver
-      if not versions.hasKey(pv.name):
-        versions[pv.name] = PackageVersions(pkgName: pv.name, versions: @[pkgMin])
+        
+        # If this is a special version, clear any existing regular versions
+        # to force the SAT solver to use this specific version
+        if versions.hasKey(pv.name):
+          versions[pv.name].versions = @[pkgMin]
+        else:
+          versions[pv.name] = PackageVersions(pkgName: pv.name, versions: @[pkgMin])
       else:
-        versions[pv.name].versions.addUnique pkgMin
+        if not versions.hasKey(pv.name):
+          versions[pv.name] = PackageVersions(pkgName: pv.name, versions: @[pkgMin])
+        else:
+          versions[pv.name].versions.addUnique pkgMin
 
       for req in pkgMin.requires:
         processRequirements(versions, req, visited, getMinimalPackage, preferredPackages, options)

tests/gitversions/gitversions.nimble

@@ -5,6 +5,7 @@ author        = "jmgomez"
 description   = "A new awesome nimble package"
 license       = "MIT"
 srcDir        = "src"
+bin           = @["gitversions"]
 
 
 # Dependencies

tests/gitversions/src/gitversions.nim

@@ -1,6 +1,10 @@
 # This is just an example to get you started. A typical library package
 # exports the main API in this file. Note that you cannot rename this file
 # but you can remove it if you wish.
+when not defined(no_test):
+  import json_serialization/nimbletest
+
+  hello()
 
 proc add*(x, y: int): int =
   ## Adds two numbers together.

tests/gitversions/tests/test1.nim

@@ -7,6 +7,7 @@
 
 import unittest
 
-import gitversions
-test "can add":
-  check add(5, 5) == 10
+when not defined(no_test):
+  import json_serialization/nimbletest
+
+  hello()

tests/tests/test1.nim

@@ -0,0 +1,12 @@
+# This is just an example to get you started. You may wish to put all of your
+# tests into a single file, or separate them into multiple `test1`, `test2`
+# etc. files (better names are recommended, just make sure the name starts with
+# the letter 't').
+#
+# To run these tests, simply execute `nimble test`.
+
+import unittest
+
+import tests
+test "can add":
+  check add(5, 5) == 10

tests/trequireflag.nim

@@ -46,9 +46,9 @@ suite "requires flag":
   ]#
     let requires = [
       "https://github.com/status-im/nim-json-serialization.git#nimble_test_dont_delete",
-      "https://github.com/status-im/nim-json-serialization.git#e45fe67d71f006f15a32f90a5a56a4775982d951",
+      "https://github.com/status-im/nim-json-serialization.git#26bea5ffce20ae0d0855b3d61072de04d3bf9826",
       "json_serialization#nimble_test_dont_delete",
-      "json_serialization#e45fe67d71f006f15a32f90a5a56a4775982d951",
+      "json_serialization#26bea5ffce20ae0d0855b3d61072de04d3bf9826",
       "json_serialization == 0.2.9"
     ]
     cleanDir(installDir)
@@ -57,10 +57,15 @@ suite "requires flag":
         let require = "--requires: " & req
         let isVersion = req.contains("==")
         # echo "Trying require: ", req
-        let (output, exitCode) = execNimble("install", require)
+        let no_test = if isVersion: "-d:no_test" else: ""
+        let (output, exitCode) = execNimble("run", require, no_test)
         let pkgDir = getPackageDir(pkgsDir, "json_serialization-0.2.9")
         check exitCode == QuitSuccess
-        let nimbleTestDontDeleteFile =  pkgDir / "json_serialization" / "nimble.test.nim"
+        
+        let (_, exitCodeTest) = execNimble("test", require, no_test)
+        check exitCodeTest == QuitSuccess
+
+        let nimbleTestDontDeleteFile =  pkgDir / "json_serialization" / "nimbletest.nim"
         # echo "Nimble test dont delete file: ", nimbleTestDontDeleteFile
         if isVersion:
           check output.processOutput.inLines("Success:  json_serialization installed successfully.")