Merge pull request conda#1601 from ilastik/ilastik

Improve fall-back version comparison, second attempt
asmeurer · Sep 23, 2015 · 4ce4555 · 4ce4555
2 parents 633b954 + c92479a
commit 4ce4555
Show file tree

Hide file tree

Showing 5 changed files with 384 additions and 422 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -31,8 +31,6 @@ Exceptions
 
 versioneer.py is Public Domain
 
-verlib.py is Public Domain
-
 The ProgressBar package is released under the following terms:
 
 # progressbar  - Text progress bar library for Python.

diff --git a/conda/README.txt b/conda/README.txt
@@ -10,12 +10,12 @@
               /   |     |      |      |
              /    |     |      |      |
       resolve   fetch   |      |   progressbar
-      /  |  \           |      |
-     /   |   \          |      |
-  verlib |  utils    config  install
-         |              |
-         |              |
-         |          (optional)
-         |              |
-         |              |
-      pycosat          yaml
+      /     \           |      |
+     /       \          |      |
+ pycosat    utils    config  install
+                        |
+                        |
+                    (optional)
+                        |
+                        |
+                       yaml