Merge pull request #266 from ToFuProject/devel

Preparing 1.4.2

Author: Didou09

.gitignore

@@ -7,6 +7,8 @@
 *.c
 *.cpp
 *.nfs*
+
+# annotated files
 tofu/geom/*.html
 
 # No images
@@ -38,24 +40,33 @@ dist/
 tofu.egg-info/
 build/
 
-#Notes_Upgrades/
-
 # Tex files
 *.aux
 *.log
 
-# .gitignore
-1
-Introduction
-computing
-Details
+# coverage output
 .coverage
 
 # Include travis
 !.travis.yml
 
+# no precommit configurations
+.pre-commit-config.yaml
+
 # installation dir
 usr/
 
-# tests of LOS on west and ITER
-tofu/tests/tests01_geom/laura_tmp/
+# no PyCharm config files
+.idea/
+
+# do not commit sphinx built files
+doc/build/html/
+
+# do not commit built compiled files on windows
+*.pyd
+
+# do not commit sphinx-gallery files
+doc/source/auto_examples/
+
+# do not commit nose tests files
+*.noseids

.travis.yml

@@ -1,8 +1,7 @@
 language: python
 python:
-- '2.7'
 - '3.6'
-#- '3.7-dev'
+- '3.7-dev'
 
 git:
   depth: 200
@@ -14,9 +13,9 @@ before_install:
   - gcc --version
   - export START=$(pwd)
 install:
-- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
-  -O miniconda.sh; export VADD="py27"; else wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-  -O miniconda.sh; export VADD="py36";  fi
+- if [[ "$TRAVIS_PYTHON_VERSION" == "3.7-dev" ]]; then export VADD="py37"; else export VADD="py36";  fi
+- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+  -O miniconda.sh
 - bash miniconda.sh -b -p $HOME/miniconda
 - export PATH="$HOME/miniconda/bin:$PATH"
 - hash -r

benchmarks/__init__.py Debug_JINTRACMesh.pdfbenchmarks/__init__.py renamed to Debug_JINTRACMesh.pdf

@@ -0,0 +1,10 @@
+@article{didier2016,
+  title={Non-monotonic growth rates of sawtooth precursors evidenced with a new method on ASDEX Upgrade},
+  author={Vezinet, D and Igochine, V and Weiland, M and Yu, Q and Gude, A and Meshcheriakov, D and Sertoli, M and EUROfusion MST1 Team and others},
+  journal={Nuclear Fusion},
+  volume={56},
+  number={8},
+  pages={086001},
+  year={2016},
+  publisher={IOP Publishing}
+}