fixing test_path

updated a few more test references

Update .gitlab-ci.yml

Updated readme

small fix to yml and readme

Specify the test machine to ignore Colonel dir

correcting ignore statement

.gitlab-ci.yml

@@ -9,7 +9,7 @@ test_topfarm:  # name the job what we like
     test
   script:
   - pip install --upgrade git+git://github.com/FUSED-Wind/FUSED-Wake@master
-  - cd tests; py.test
+  - py.test
   tags:  # only runners with this tag can do the job [3]
   - python
 
@@ -21,8 +21,7 @@ test_topfarm_windows:  # name the job what we like
   stage:  # build, test, deploy defined by default [2]
     test
   script:  # runs on windows machine due to tag below
-  - cd tests
-  - c:/Anaconda3/envs/pyTopfarm/python.exe -m pytest --cov-report term-missing:skip-covered --cov=../topfarm --cov-config ../.coveragerc
+  - c:/Anaconda3/envs/pyTopfarm/python.exe -m pytest --cov-report term-missing:skip-covered --cov=topfarm --cov-config .coveragerc --ignore=topfarm/cost_models/fuga/Colonel
   tags:  # tag for shared runner on windows machine
   - CPAV_old_PC
 

README.md

@@ -8,8 +8,16 @@ Install windows
 
 ```conda create -n pyTopfarm python=3.6
 activate pyTopfarm
+git clone https://github.com/FUSED-Wind/FUSED-Wake.git
+cd FUSED-Wake
+pip install -e .
+cd..
+git clone https://github.com/FUSED-Wind/windIO.git
+cd windIO
+pip install -e .
+cd..
 git clone https://gitlab.windenergy.dtu.dk/TOPFARM/TopFarm2.git
 cd Topfarm2
 pip install -e .
-cd tests
+cd topfarm/tests
 python -m pytest```

topfarm/cost_models/fuga/lib_reader.py

@@ -5,7 +5,7 @@ Created on 25. apr. 2018
 '''
 import os
 import numpy as np
-from tests.test_files import tfp
+from topfarm.tests.test_files import tfp
 
 
 def read_lib(filename):

topfarm/cost_models/utils/aep_calculator.py

@@ -10,7 +10,7 @@ import numpy as np
 from topfarm.cost_models.fused_wake_wrappers import FusedWakeGCLWakeModel
 from topfarm.cost_models.utils.wind_resource import WindResource
 from topfarm.cost_models.cost_model_wrappers import AEPCostModelComponent
-from tests.test_files import testfilepath
+from topfarm.tests.test_files import testfilepath
 
 
 class AEPCalculator(object):

tests/test_costmodel_utils/test_aep_calculator.py → topfarm/tests/test_costmodel_utils/test_aep_calculator.py

@@ -7,7 +7,7 @@ import unittest
 
 import numpy as np
 from topfarm.cost_models.utils.wind_resource import WindResource
-from tests.test_files import testfilepath
+from topfarm.tests.test_files import testfilepath
 from topfarm.cost_models.fused_wake_wrappers import FusedWakeGCLWakeModel
 from topfarm.cost_models.utils.aep_calculator import AEPCalculator
 import warnings