Skip to content

Commit 2912873

Browse files
committed
use version-query
1 parent 32e14ba commit 2912873

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ install:
8383
# Java
8484
- python -m open_fortran_parser --dev-deps
8585
- export CLASSPATH="${CLASSPATH}:$(pwd)/lib/*"
86-
- ant
86+
- ant -Dpython=python
8787
- export CLASSPATH="${CLASSPATH}:$(pwd)/dist/*"
8888
# Java tests
8989
- 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

+16-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,22 @@
33

44
<property name="debuglevel" value="source,lines,vars" />
55

6-
<loadfile srcfile="open_fortran_parser/_version.py" property="version">
7-
<filterchain>
8-
<linecontainsregexp>
9-
<regexp pattern="^VERSION = '.+'.*$" />
10-
</linecontainsregexp>
11-
<tokenfilter>
12-
<replaceregex pattern="^VERSION = '(.+)'.*$" replace="\1" />
13-
</tokenfilter>
14-
<striplinebreaks />
15-
</filterchain>
16-
</loadfile>
6+
<property name="python" value="python3" />
7+
8+
<exec executable="${python}" outputproperty="version" resultproperty="version.error">
9+
<arg value="-m" />
10+
<arg value="version_query" />
11+
<arg value="-p" />
12+
<arg value="." />
13+
</exec>
14+
15+
<fail message="Failed to query project version: ${version}">
16+
<condition>
17+
<not>
18+
<equals arg1="${version.error}" arg2="0" />
19+
</not>
20+
</condition>
21+
</fail>
1722

1823
<property name="src.dir" value="src" />
1924
<property name="bin.dir" value="bin" />

open_fortran_parser/_version.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
"""Version of open_fortran_parser package."""
22

3-
VERSION = '0.5.5.dev0'
3+
from version_query import predict_version_str
4+
5+
VERSION = predict_version_str()

requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
version-query
12
wget

0 commit comments

Comments
 (0)