Skip to content

Commit 3536740

Browse files
committed
get JaCoCo through dependency downloader
1 parent 1fe5fd8 commit 3536740

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ install:
8585
- export CLASSPATH="${CLASSPATH}:$(pwd)/lib/*"
8686
- ant -Dpython=python
8787
- export CLASSPATH="${CLASSPATH}:$(pwd)/dist/*"
88-
# Java tests
89-
- wget "https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.agent/0.8.3/org.jacoco.agent-0.8.3-runtime.jar" -O "lib/org.jacoco.agent-0.8.3-runtime.jar"
90-
- wget "https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.cli/0.8.3/org.jacoco.cli-0.8.3-nodeps.jar" -O "lib/org.jacoco.cli-0.8.3-nodeps.jar"
9188

9289
script:
9390
- |

README.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -646,16 +646,15 @@ Run basic tests:
646646
code coverage
647647
~~~~~~~~~~~~~
648648

649-
Getting code coverage results for Java requires JaCoCo agent, and JaCoCo CLI.
649+
Getting code coverage results for Java requires JaCoCo agent, and JaCoCo CLI,
650+
and both are dowonloaded automatically along with other development dependencies.
650651

651-
Set up code coverage for Java:
652+
Currently, test setup relies on JaCoCo 0.8.3:
652653

653-
.. code:: bash
654-
655-
wget "https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.agent/0.8.3/org.jacoco.agent-0.8.3-runtime.jar" -O "lib/org.jacoco.agent-0.8.3-runtime.jar"
656-
wget "https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.cli/0.8.3/org.jacoco.cli-0.8.3-nodeps.jar" -O "lib/org.jacoco.cli-0.8.3-nodeps.jar"
654+
* JaCoCo agent 0.8.3 (runtime)
655+
* JaCoCo CLI 0.8.3 (nodeps)
657656

658-
Then, run all test and gather code coverage:
657+
Run all test and gather code coverage:
659658

660659
.. code:: bash
661660

appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ install:
9292
- set CLASSPATH=%cd%\\lib\\*;%CLASSPATH%
9393
- ant -Dpython=python
9494
- set CLASSPATH=%cd%\\dist\\*;%CLASSPATH%
95-
# Java tests
96-
- ps: Invoke-WebRequest "https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.agent/0.8.3/org.jacoco.agent-0.8.3-runtime.jar" -OutFile "lib\\org.jacoco.agent-0.8.3-runtime.jar"
97-
- ps: Invoke-WebRequest "https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.cli/0.8.3/org.jacoco.cli-0.8.3-nodeps.jar" -OutFile "lib\\org.jacoco.cli-0.8.3-nodeps.jar"
9895

9996
build: off
10097

open_fortran_parser/config.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,17 @@
2626

2727
DEV_DEPENDENCIES = COMMON_DEPENDENCIES.copy()
2828

29+
DEV_DEPENDENCIES.update({
30+
'JaCoCo agent 0.8.3': (
31+
urllib.parse.urlparse(
32+
'https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.agent/0.8.3/'),
33+
pathlib.Path('org.jacoco.agent-0.8.3-runtime.jar')),
34+
'JaCoCo CLI 0.8.3': (
35+
urllib.parse.urlparse(
36+
'https://search.maven.org/remotecontent?filepath=org/jacoco/org.jacoco.cli/0.8.3/'),
37+
pathlib.Path('org.jacoco.cli-0.8.3-nodeps.jar')),
38+
})
39+
2940
DEPENDENCIES = COMMON_DEPENDENCIES.copy()
3041

3142
DEPENDENCIES.update({

0 commit comments

Comments
 (0)