Merge branch 'dev'

winbench · Apr 2, 2019 · bd7cdc5 · bd7cdc5
2 parents 5a6e9b0 + 1215ad4
commit bd7cdc5
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.1.0")]
-[assembly: AssemblyFileVersion("0.22.1.0")]
+[assembly: AssemblyVersion("0.22.2.0")]
+[assembly: AssemblyFileVersion("0.22.2.0")]
diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.1.0")]
-[assembly: AssemblyFileVersion("0.22.1.0")]
+[assembly: AssemblyVersion("0.22.2.0")]
+[assembly: AssemblyFileVersion("0.22.2.0")]
diff --git a/BenchManager/BenchLib/BenchTasks.cs b/BenchManager/BenchLib/BenchTasks.cs
@@ -2303,7 +2303,14 @@ private static void InstallPythonPackage(BenchConfiguration config, IProcessExec
             }
             else if (app.IsVersioned)
             {
-                argList.Add(app.PackageName + "==" + app.Version);
+                var version = app.Version;
+                if (!version.Contains("<") &&
+                    !version.Contains(">") &&
+                    !version.Contains("="))
+                {
+                    version = "==" + version;
+                }
+                argList.Add(app.PackageName + version);
             }
             else
             {

diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.1.0")]
-[assembly: AssemblyFileVersion("0.22.1.0")]
+[assembly: AssemblyVersion("0.22.2.0")]
+[assembly: AssemblyFileVersion("0.22.2.0")]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,14 @@ Add a link to the GitHub diff like
 
 [Unreleased]: https://github.com/winbench/bench/compare/master...dev
 
+## [0.22.2] - 2019-04-02
+
+[0.22.2]: https://github.com/winbench/bench/compare/v0.22.1...v0.22.2
+
+### Fixed
+* Fixed version ranges for Python packages
+  ([#140](https://github.com/winbench/bench/issues/140))
+
 ## [0.22.1] - 2019-03-29
 
 [0.22.1]: https://github.com/winbench/bench/compare/v0.22.0...v0.22.1

diff --git a/res/bench-install.bat b/res/bench-install.bat
@@ -7,7 +7,7 @@ SetLocal
 :: https://winbench.org/guide/setup/
 ::
 
-SET VERSION=0.22.1
+SET VERSION=0.22.2
 SET TAG=v%VERSION%
 SET ROOT=%~dp0
 IF [%1] NEQ [] SET ROOT=%~dpnx1\

diff --git a/res/version.txt b/res/version.txt
@@ -1 +1 @@
-0.22.1
+0.22.2