Merge pull request #18 from bendudson/travis

Travis testing
freegs-plasma · Nov 10, 2019 · ef2024a · ef2024a
2 parents c6e28a0 + e4a9582
commit ef2024a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,10 @@
+language: python
+python:
+  - "3.6"
+# command to install dependencies
+install:
+  - pip install -r requirements.txt
+# command to run tests
+script:
+  - pytest
+
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@ FreeGS: Free boundary Grad-Shafranov solver
 
 [![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://img.shields.io/badge/license-GPL-blue.svg)
 [![py3comp](https://img.shields.io/badge/py3-compatible-brightgreen.svg)](https://img.shields.io/badge/py3-compatible-brightgreen.svg)
+[![Build Status](https://travis-ci.org/bendudson/freegs.svg?branch=master)](https://travis-ci.org/bendudson/freegs)
 
 This Python module calculates plasma equilibria for tokamak fusion experiments,
 by solving the Grad-Shafranov equation with free boundaries. Given a set of coils,

diff --git a/freegs/gradshafranov.py b/freegs/gradshafranov.py
@@ -43,7 +43,6 @@ class GSElliptic:
     d^2/dR^2 + d^2/dZ^2 - (1/R)*d/dR
     
     """
-
     def __init__(self, Rmin):
         """
         Specify minimum radius

diff --git a/freegs/test_optimiser.py b/freegs/test_optimiser.py
@@ -1,4 +1,4 @@
-import optimiser
+from . import optimiser
 
 # Tests and example of solving optimisation problem
 #

diff --git a/freegs/test_polygons.py b/freegs/test_polygons.py
@@ -1,4 +1,4 @@
-import polygons
+from . import polygons
 
 def test_nointersect():
     assert polygons.intersect([0,1], [0,0], [0,1], [1,1]) == False

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,3 @@
+numpy>=1.14.1
+scipy>=1.0.0
+matplotlib>=2.0.0