Skip to content

Commit

Permalink
Merge pull request #202 from itesla/ipst-entsoe
Browse files Browse the repository at this point in the history
Ipst entsoe
  • Loading branch information
geofjamg committed Jan 17, 2017
2 parents 80da42d + 8d87376 commit 7585eb5
Show file tree
Hide file tree
Showing 167 changed files with 60 additions and 76,322 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ jdk:
install:
# Build iPST core
- git clone https://github.com/itesla/ipst-core itesla/ipst-core
- cd itesla/ipst-core && mvn install
- pushd itesla/ipst-core && mvn install && popd

# Build iPST entsoe
- git clone https://github.com/itesla/ipst-entsoe itesla/ipst-entsoe
- pushd itesla/ipst-entsoe && mvn install && popd

script:
- cd ${TRAVIS_BUILD_DIR}
- mvn clean test jacoco:report coveralls:report

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ In order to build iPST you need:
* CMake *(2.6 or greater)*
* Recent C++ compiler (GNU g++ or Clang)
* [ipst-core](https://github.com/itesla/ipst-core)
* [ipst-entsoe](https://github.com/itesla/ipst-entsoe)

Optional C++ modules requires:
* Intel Fortran Compiler
Expand Down
8 changes: 5 additions & 3 deletions ampl-export/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,21 @@
<name>AMPL export</name>

<dependencies>
<!-- Compilation dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>eu.itesla_project</groupId>
<artifactId>iidm-converter-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>eu.itesla_project</groupId>
<artifactId>network-merge</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
79 changes: 0 additions & 79 deletions cim1-import/pom.xml

This file was deleted.

This file was deleted.

0 comments on commit 7585eb5

Please sign in to comment.