Merge branch 'tests/logging_format'

Author: mbdevpl

.travis.yml

@@ -83,7 +83,7 @@ install:
   # Java
   - python -m open_fortran_parser --dev-deps
   - export CLASSPATH="${CLASSPATH}:$(pwd)/lib/*"
-  - ant
+  - ant -Dpython=python
   - export CLASSPATH="${CLASSPATH}:$(pwd)/dist/*"
   # Java tests
   - wget "https://github.com/mbdevpl/open-fortran-parser-xml/releases/download/v0.2.0/org.jacoco.agent-0.8.1-runtime.jar" -O "lib/org.jacoco.agent-0.8.1-runtime.jar"

build.xml

@@ -3,17 +3,22 @@
 
 	<property name="debuglevel" value="source,lines,vars" />
 
-	<loadfile srcfile="open_fortran_parser/_version.py" property="version">
-		<filterchain>
-			<linecontainsregexp>
-				<regexp pattern="^VERSION = '.+'.*$" />
-			</linecontainsregexp>
-			<tokenfilter>
-				<replaceregex pattern="^VERSION = '(.+)'.*$" replace="\1" />
-			</tokenfilter>
-			<striplinebreaks />
-		</filterchain>
-	</loadfile>
+	<property name="python" value="python3" />
+
+	<exec executable="${python}" outputproperty="version" resultproperty="version.error">
+		<arg value="-m" />
+		<arg value="version_query" />
+		<arg value="-p" />
+		<arg value="." />
+	</exec>
+
+	<fail message="Failed to query project version: ${version}">
+		<condition>
+			<not>
+					<equals arg1="${version.error}" arg2="0" />
+			</not>
+		</condition>
+	</fail>
 
 	<property name="src.dir" value="src" />
 	<property name="bin.dir" value="bin" />

logging.properties

@@ -1,10 +1,12 @@
 handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
 .level = FINEST
 
+java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] [%4$-7s] %5$s %n
+
 java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 java.util.logging.FileHandler.level = FINER
-java.util.logging.FileHandler.level = formatter
 java.util.logging.FileHandler.limit = 524288
 java.util.logging.FileHandler.count = 100
 java.util.logging.FileHandler.pattern = test/results/logs/parser_%g.log

open_fortran_parser/_version.py

@@ -1,3 +1,5 @@
 """Version of open_fortran_parser package."""
 
-VERSION = '0.5.5.dev0'
+from version_query import predict_version_str
+
+VERSION = predict_version_str()

requirements.txt

@@ -1 +1,2 @@
+version-query
 wget