Merge pull request #205 from OceanParcels/renaming_parcelsscripts_package

Moving scripts package to parcels/scripts directory

Author: erikvansebille

.travis.yml

@@ -34,7 +34,6 @@ script:
     - flake8 parcels
     - flake8 tests
     - flake8 examples
-    - flake8 scripts
-    - python scripts/pull_data.py
+    - python parcels/scripts/pull_data.py
     - py.test -v -s tests/
     - py.test -v -s examples/

examples/parcels_tutorial.ipynb

@@ -50,8 +50,7 @@
    },
    "outputs": [],
    "source": [
-    "from parcels import FieldSet, ParticleSet, Variable, JITParticle, AdvectionRK4\n",
-    "from scripts import plotTrajectoriesFile\n",
+    "from parcels import FieldSet, ParticleSet, Variable, JITParticle, AdvectionRK4, plotTrajectoriesFile\n",
     "import numpy as np\n",
     "import math\n",
     "from datetime import timedelta\n",

examples/tutorial_delaystart.ipynb

@@ -34,11 +34,10 @@
    },
    "outputs": [],
    "source": [
-    "from parcels import FieldSet, ParticleSet, JITParticle\n",
+    "from parcels import FieldSet, ParticleSet, JITParticle, plotTrajectoriesFile\n",
     "from parcels import AdvectionRK4\n",
     "import numpy as np\n",
-    "from datetime import timedelta as delta\n",
-    "from scripts import *"
+    "from datetime import timedelta as delta"
    ]
   },
   {

examples/tutorial_periodic_boundaries.ipynb

@@ -52,10 +52,9 @@
    },
    "outputs": [],
    "source": [
-    "from parcels import FieldSet, ParticleSet, JITParticle\n",
+    "from parcels import FieldSet, ParticleSet, JITParticle, plotTrajectoriesFile\n",
     "from parcels import AdvectionRK4\n",
     "from datetime import timedelta as delta\n",
-    "from scripts import plotTrajectoriesFile\n",
     "import math"
    ]
   },

parcels/__init__.py

@@ -6,3 +6,4 @@
 import parcels.rng as random  # noqa
 from parcels.particlefile import *  # noqa
 from parcels.kernels import *  # noqa
+from parcels.scripts import *  # noqa

parcels/scripts/__init__.py

@@ -0,0 +1 @@
+from .plotParticles import plotTrajectoriesFile  # NOQA get flake8 to ignore unused import.