omniopt2 7126__tar.gz → 7128__tar.gz

{omniopt2-7126 → omniopt2-7128}/.colorfunctions.sh

@@ -27,34 +27,46 @@ function green {
 	echo -ne "${Green}$1${Color_Off}"
 }
 
-function _tput {
+_tput() {
 	set +e
 	CHAR=$1
 
-	if ! command -v tput 2>/dev/null >/dev/null; then
-		red_text "tput not installed" >&2
-		set +e
-		return 0
-	fi
-
 	if [[ -z $CHAR ]]; then
 		red_text "No character given" >&2
-		set +e
 		return 0
 	fi
 
-	if ! tty 2>/dev/null >/dev/null; then
-		echo ""
-		set +e
-		return 0
-	fi
+	case "$CHAR" in
+		cr)
+			echo -ne '\r'
+			return 0
+			;;
+		el)
+			echo -ne '\033[K'
+			return 0
+			;;
+		bel)
+			if [[ "$OO_MAIN_TESTS" -eq "1" ]]; then
+				echo "Not print BEL-character for main-test-suite ($CHAR, $OO_MAIN_TESTS)"
+				return 0
+			else
+				echo -ne '\a'
+				return 0
+			fi
+			;;
+	esac
 
-	if [[ "$CHAR" == "bel" ]] && [[ "$OO_MAIN_TESTS" -eq "1" ]]; then
-		echo "Not print BEL-character for main-test-suite ($CHAR, $OO_MAIN_TESTS)"
+	if command -v tput >/dev/null 2>&1; then
+		if tty >/dev/null 2>&1; then
+			tput "$CHAR"
+		else
+			red_text "Skipping tput $CHAR: no tty and no fallback" >&2
+		fi
 	else
-		tput "$CHAR"
+		red_text "tput not installed" >&2
 	fi
-	set +e
+
+	return 0
 }
 
 function green_reset_line {

{omniopt2-7126 → omniopt2-7128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7126
+Version: 7128
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-7126 → omniopt2-7128}/omniopt

@@ -366,37 +366,6 @@
 		fi
 	done
 
-	function _tput {
-		set +e
-		CHAR=$1
-
-		if ! command -v tput 2>/dev/null >/dev/null; then
-			red_text "tput not installed\n" >&2
-			set +e
-			return 0
-		fi
-
-		if [[ -z $CHAR ]]; then
-			red_text "No character given\n" >&2
-			set +e
-			return 0
-		fi
-
-		if ! tty 2>/dev/null >/dev/null; then
-			echo ""
-			set +e
-			return 0
-		fi
-
-		if [[ "$CHAR" == "bel" ]] && [[ "$OO_MAIN_TESTS" -eq "1" ]]; then
-			echo "Not print BEL-character for main-test-suite ($CHAR, $OO_MAIN_TESTS)"
-		else
-			tput "$CHAR"
-		fi
-
-		set +e
-	}
-
 	int_re='^[+-]?[0-9]+$'
 
 	if [[ -n $PRINT_SEPERATOR ]]; then # for tests, so that things are properly visually seperated
@@ -1784,7 +1753,7 @@ EOF
 							_tput el # Delete line from start to finish
 
 							echo -ne "$print_line"
-							sleep 0.2
+							sleep 0.05
 						done
 
 						_tput cnorm # Enable cursor

{omniopt2-7126 → omniopt2-7128}/omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7126
+Version: 7128
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-7126 → omniopt2-7128}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {email = "norman.koch@tu-dresden.de"},
   {name = "Norman Koch"}
 ]
-version = "7126"
+version = "7128"
 
 readme = "README.md"
 dynamic = ["dependencies"]