Merge branch 'master' of https://github.com/geoscixyz/gpgLabs

Author: thast

.travis.yml

@@ -5,7 +5,11 @@ python:
 sudo: false
 
 env:
-    - TEST_DIR="tests"
+  global:
+    - PYPI_PY=3.6  # deploy to pypi from python 3.6
+
+env:
+  - TEST_DIR="tests"
 
 # Setup anaconda
 before_install:
@@ -18,7 +22,20 @@ install:
 
 # Run test
 script:
-  - nosetests $TEST_DIR -v -s
+  - travis_wait 30 nosetests $TEST_DIR -v -s
+
+# upload to pypi on success
+after_success:
+  #deploy to pypi
+  - if [ $TRAVIS_PYTHON_VERSION == $PYPI_PY ]; then
+      if [ "$TRAVIS_TAG" = "true" ]; then
+        openssl aes-256-cbc -K $encrypted_bc303f70394a_key -iv $encrypted_bc303f70394a_iv -in credentials.tar.gz.enc -out credentials.tar.gz -d;
+        tar -xzf credentials.tar.gz;
+        mv credentials/.pypirc ~/.pypirc ;
+        python setup.py sdist bdist_wheel ;
+        travis_wait 20 twine upload -r pypi --skip-existing dist/* ;
+      fi
+    fi
 
 notifications:
   slack: ubcgif:1Z2lR3XYRSM3GHflG71ZHEN6

Notebooks/GPR_Lab6_FitData.ipynb

@@ -62,19 +62,10 @@
    "execution_count": 2,
    "metadata": {},
    "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Downloading https://github.com/geoscixyz/gpgLabs/raw/master/figures/GPR/ubc_GPRdata.png\n",
-      "   saved to: C:\\Users\\Devin\\Documents\\GPGlabs\\notebooks\\ubc_GPRdata.png\n",
-      "Download completed!\n"
-     ]
-    },
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "cc6ed9543d7f44a7b23e1bfeafc7f59d"
+       "model_id": "94b533cad0a54e598df4e27ade6ebe50"
       }
      },
      "metadata": {},
@@ -92,8 +83,8 @@
     }
    ],
    "source": [
-    "radargramImagePath = \"https://github.com/geoscixyz/gpgLabs/raw/master/figures/GPR/ubc_GPRdata.png\"\n",
-    "radargramImage = download(radargramImagePath,overwrite=True,verbose=False)\n",
+    "URL = \"https://github.com/geoscixyz/gpgLabs/raw/master/figures/GPR/ubc_GPRdata.png\"\n",
+    "radargramImage = downloadRadargramImage(URL)\n",
     "PipeWidget(radargramImage)"
    ]
   },
@@ -117,24 +108,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {
     "scrolled": true
    },
    "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Downloading https://github.com/geoscixyz/gpgLabs/raw/master/figures/GPR/ubc_GPRdata.png\n",
-      "   saved to: C:\\Users\\Devin\\Documents\\GPGlabs\\notebooks\\ubc_GPRdata.png\n",
-      "Download completed!\n"
-     ]
-    },
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "8db9b8cc34f44b068c390baa85ce9635"
+       "model_id": "9b6c195504c14ea38c09ac60dd1cc3c6"
       }
      },
      "metadata": {},
@@ -146,14 +128,14 @@
        "<function gpgLabs.GPR.GPRlab1.WallWidgetFcn>"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "radargramImagePath = \"https://github.com/geoscixyz/gpgLabs/raw/master/figures/GPR/ubc_GPRdata.png\"\n",
-    "radargramImage = download(radargramImagePath,overwrite=True,verbose=False)\n",
+    "URL = \"https://github.com/geoscixyz/gpgLabs/raw/master/figures/GPR/ubc_GPRdata.png\"\n",
+    "radargramImage = downloadRadargramImage(URL)\n",
     "WallWidget(radargramImage)"
    ]
   },

Notebooks/shot_raypaths.npy

@@ -8,6 +8,24 @@
 
 from .Wiggle import wiggle, PrimaryWave, ReflectedWave
 
+import requests
+from io import BytesIO
+
+
+########################################
+#           DOWNLOAD FUNCTIONS
+########################################
+
+def downloadRadargramImage(URL):
+
+    urlObj = requests.get(URL)
+    imgcmp = Image.open(BytesIO(urlObj.content))
+
+    return imgcmp
+
+
+
+
 ########################################
 #           WIDGETS
 ########################################
@@ -43,23 +61,25 @@ def PipeWidget(radargramImage):
             h=(0.1, 2.0, 0.1),
             xc=(0., 40., 0.2),
             r=(0.1, 3, 0.1),
-            dataImage=fixed(radargramImage))
+            imgcmp=fixed(radargramImage))
 
     return i
 
 
-def WallWidget(radargramImage):
+def WallWidget(radargramImagePath):
 
     i = interact(WallWidgetFcn,
             epsr = (0, 100, 1),
             h=(0.1, 2.0, 0.1),
             x1=(1, 35, 1),
             x2=(20, 40, 1),
-            dataImage=fixed(radargramImage))
+            imgcmp=fixed(radargramImagePath))
 
     return i
 
 
+
+
 ########################################
 #           FUNCTIONS
 ########################################
@@ -121,8 +141,9 @@ def PrimaryFieldWidgetFcn(tinterp, epsr, radgramImg):
     plt.show()
 
 
-def PipeWidgetFcn(epsr, h, xc, r, dataImage):
-    imgcmp = Image.open(dataImage)
+def PipeWidgetFcn(epsr, h, xc, r, imgcmp):
+
+    # imgcmp = Image.open(dataImage)
     imgcmp = imgcmp.resize((600, 800))
     fig = plt.figure(figsize = (9,11))
     ax = plt.subplot(111)
@@ -143,8 +164,9 @@ def PipeWidgetFcn(epsr, h, xc, r, dataImage):
     plt.show()
 
 
-def WallWidgetFcn(epsr, h, x1, x2, dataImage):
-    imgcmp = Image.open(dataImage)
+def WallWidgetFcn(epsr, h, x1, x2, imgcmp):
+
+    # imgcmp = Image.open(dataImage)
     imgcmp = imgcmp.resize((600, 800))
     fig = plt.figure(figsize = (9,11))
     ax = plt.subplot(111)