Fixed .travis.yml version

.appveyor.yml

@@ -1,66 +1,66 @@
-environment:
-  matrix:
-    - PYTHON_VERSION: 3.6
-      MINICONDA: C:\Miniconda3
-      ARCH: "64"
-      NUMPY_VERSION: "1.15.*"
-init:
-  - "ECHO %PYTHON_VERSION% %MINICONDA%"
-
-install:
-  - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
-  - conda info -a
-  - conda env create -f environment.yml
-
-  # Install dependencies
-  - activate devel
-
+#environment:
+#  matrix:
+#    - PYTHON_VERSION: 3.6
+#      MINICONDA: C:\Miniconda3
+#      ARCH: "64"
+#      NUMPY_VERSION: "1.15.*"
+#init:
+#  - "ECHO %PYTHON_VERSION% %MINICONDA%"
+#
+#install:
+#  - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
+#  - conda config --set always_yes yes --set changeps1 no
+#  - conda update -q conda
+#  - conda info -a
+#  - conda env create -f environment.yml
+#
+#  # Install dependencies
+#  - activate devel
+# 
   # Add to path the current folder
-  - "SET PYTHONPATH=%PYTHONPATH%;%CD%"
+#  - "SET PYTHONPATH=%PYTHONPATH%;%CD%"
 
   # Install SHARPpy
-  - python setup.py -q install
+#  - python setup.py -q install
 
   # Resize the screen 
   #- nuget restore
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/set-screenresolution.ps1'))  
-  - ps: Set-ScreenResolution 1366 768
+#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/set-screenresolution.ps1'))  
+#  - ps: Set-ScreenResolution 1366 768
 
-build: off
+#build: off
 
 # Turning off Test Script for now  
-test_script:
+#test_script:
 #  - sharppy examples/data/14061619.OAX
   - pytest -v
 
-after_test:
-  - "conda list"
-  - "cd runsharp"
-  - "pyinstaller SHARPpy-win7-%ARCH%.spec"
-  - "cd .."
+#after_test:
+#  - "conda list"
+#  - "cd runsharp"
+#  - "pyinstaller SHARPpy-win7-%ARCH%.spec"
+#  - "cd .."
 #  - "move dist\\SHARPpy.exe dist\\SHARPpy%ARCH%.exe"
 
-artifacts:
-  - path: "runsharp\\dist\\SHARPpy64.exe"
-    name: binary
-
-  - path: "*.png"
-    name: test images
+#artifacts:
+#  - path: "runsharp\\dist\\SHARPpy64.exe"
+#    name: binary
+# 
+#  - path: "*.png"
+#    name: test images
 
-  - path: "examples\\data\\14061619.png"
-    name: test gui
+#  - path: "examples\\data\\14061619.png"
+#    name: test gui
 
-deploy:
-  provider: GitHub
-  release: $(appveyor_repo_tag_name)
-  auth_token:
-    secure: DB6sQwYCM7Dhhy+mjPkMd6kclvw0Sc2wglTJxcTBQue63dtIQRNa1dz/aqJG7Ygc
-  artifact: "runsharp\\dist\\SHARPpy64.exe"
-  draft: true
-  prerelease: true
-  on:
-    appveyor_repo_tag: true
+#deploy:
+#  provider: GitHub
+#  release: $(appveyor_repo_tag_name)
+#  auth_token:
+#    secure: DB6sQwYCM7Dhhy+mjPkMd6kclvw0Sc2wglTJxcTBQue63dtIQRNa1dz/aqJG7Ygc
+#  artifact: "runsharp\\dist\\SHARPpy64.exe"
+#  draft: true
+#  prerelease: true
+#  on:
+#    appveyor_repo_tag: true
 
 # Don't deploy because andover-off 

.dockerignore

@@ -0,0 +1,2 @@
+.git
+Dockerfile

.travis.yml

@@ -11,15 +11,22 @@ matrix:
   - os: linux
     language: generic
     env: 
-      - PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.15 DISPLAY_AVAIL="NO"
+      - PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.17 DISPLAY_AVAIL="YES"
   - os: osx
     language: generic
     env: 
-      - PYTHON_VERSION="3.6" DISPLAY_AVAIL="NO" BUILD_BINARY="YES" NUMPY_VERSION=1.15
+      - PYTHON_VERSION="3.6" DISPLAY_AVAIL="NO" BUILD_DOCS="YES" NUMPY_VERSION=1.17
   - os: linux
     language: generic
     env:
-      - PYTHON_VERSION="3.6" BUILD_DOCS="YES" NUMPY_VERSION=1.15 COVERALLS="YES" DISPLAY_AVAIL="NO"
+      - PYTHON_VERSION="3.6" BUILD_DOCS="NO" NUMPY_VERSION=1.17 COVERALLS="YES" DISPLAY_AVAIL="YES"
+
+addons:
+  ssh_known_hosts: 
+    - github.com
+    - 140.82.113.4
+
+>>>>>>> 94bac24129ca14d9699db507646ff87d0c669f2c
 before_install:
 - source ci/install.sh
 install:
@@ -31,30 +38,30 @@ after_success:
 # Deploy test information to coveralls
 - if [[ "$COVERALLS" == "YES" ]] ; then coveralls || echo "Coveralls upload failed" ;fi
 # Build the binary if it's a new tag.
-- if [[ -n "$TRAVIS_TAG" ]]; then source ci/make_binary.sh; fi
+#- if [[ -n "$TRAVIS_TAG" ]]; then source ci/make_binary.sh; fi
 before_deploy:
 - ls
 - pwd
-- if [ "$BUILD_BINARY" == "YES" ] && [ -n "$TRAVIS_TAG" ]; then cd dist; zip -r SHARPpy-osx.zip SHARPpy.app; cd ..; fi
+#- if [ "$BUILD_BINARY" == "YES" ] && [ -n "$TRAVIS_TAG" ]; then cd dist; zip -r SHARPpy-osx.zip SHARPpy.app; cd ..; fi
 # Ship the binaries to Github and PyPI and conda
 deploy:
 # Deploy the binaries to Github Releases
- - provider: releases
-   api_key:
-     secure: upm1CAgyi6Qv+KaHAo/v3mDyaXYSFs+vm0qS1D7IUDapGIhOTfqDgOpS71bFAnM9w+FRc7S3foxmymsHZsK97LVOEqHNibBtSmELVzhv2VHoCfAUnHaOzCi/z4DHx3QKn2ALLymFfG4O7XzSC7urHue9/h9DWy51srokafP3QOnI6sWHkWGOOOv0i13MDzv2RxMza7+PT69bQ2vFk2ujwAthanDySeXyf2kJ7WYj1cuEBfASBs+diVUSqk7FxJO7OQhyLCCn5bSS3Otvg9tkHL8H7WU6JoGHLBoUPDUxCl0KePgie6hZvaJFAlhcJfmSA4NsTQfunFnbHa2rPFPUTLO6RgEbtD0Th85VORmmEeJ8O+GmvZIRBZUiMxPAbb1DXPwI6XtgoFhNiV5rkut4JtL3BgRmAfIdAsvBfNbozgRpHAOpoiIzx/8wan+o73h6K1y+qfQwxBw+cJAL3n0A2M3x7/mpALLf3JLD8E5KKLbp/kedPIF2vKXZ92h85H9AkMopHqLHQGj86M0qHbQyMp6OHR2ivG2K9qqtzAaUNglQrUaQOHeaBZ8ZT7+mhpdhaN1w5fmuYPRchVzyNbM3DtdiUfAGc6adZPUaUktbiIpLigjwS6BO4FALngrI9+M+kk8qHv/zukOiGawzueCDUGc79G/8LI7Q1EKkiqyI+3E=
-   file_glob: true
-   file: dist/SHARPpy*.zip
-   skip_cleanup: true
-   on:
-     repo: sharppy/SHARPpy
-     tags: true
-     branch: andover
+# - provider: releases
+#   api_key:
+#     secure: upm1CAgyi6Qv+KaHAo/v3mDyaXYSFs+vm0qS1D7IUDapGIhOTfqDgOpS71bFAnM9w+FRc7S3foxmymsHZsK97LVOEqHNibBtSmELVzhv2VHoCfAUnHaOzCi/z4DHx3QKn2ALLymFfG4O7XzSC7urHue9/h9DWy51srokafP3QOnI6sWHkWGOOOv0i13MDzv2RxMza7+PT69bQ2vFk2ujwAthanDySeXyf2kJ7WYj1cuEBfASBs+diVUSqk7FxJO7OQhyLCCn5bSS3Otvg9tkHL8H7WU6JoGHLBoUPDUxCl0KePgie6hZvaJFAlhcJfmSA4NsTQfunFnbHa2rPFPUTLO6RgEbtD0Th85VORmmEeJ8O+GmvZIRBZUiMxPAbb1DXPwI6XtgoFhNiV5rkut4JtL3BgRmAfIdAsvBfNbozgRpHAOpoiIzx/8wan+o73h6K1y+qfQwxBw+cJAL3n0A2M3x7/mpALLf3JLD8E5KKLbp/kedPIF2vKXZ92h85H9AkMopHqLHQGj86M0qHbQyMp6OHR2ivG2K9qqtzAaUNglQrUaQOHeaBZ8ZT7+mhpdhaN1w5fmuYPRchVzyNbM3DtdiUfAGc6adZPUaUktbiIpLigjwS6BO4FALngrI9+M+kk8qHv/zukOiGawzueCDUGc79G/8LI7Q1EKkiqyI+3E=
+#   file_glob: true
+#   file: dist/SHARPpy*.zip
+#   skip_cleanup: true
+#   on:
+#     repo: sharppy/SHARPpy
+#     tags: true
+#     branch: andover
 # Deploy code to conda
  - provider: script
    script: bash ci/deploy_conda.sh
    on:
      repo: sharppy/SHARPpy
-     tags: false
+     tags: true
      branch: andover
      condition: "$BUILD_CONDA = YES"
 # Deploy docs to Github Pages
@@ -76,5 +83,5 @@ deploy:
      repo: sharppy/SHARPpy
      tags: true
      branch: andover-off
-     condition: "$BUILD_CONDA = YES"
+     condition: "$BUILD_CONDA = YESS"
 

CHANGELOG.rst

@@ -7,24 +7,18 @@ SHARPpy v1.4.0 "Andover" Release
 NEW FEATURES
 
 * User preferences
-    * Change units for wind, surface temperature and dewpoint
-    * Choice of three color schemes: standard (the usual white-on-black), inverted (black-on-white), and protanopia (white-on-black, but with colorblind-friendly colors)
 * Python 3 support
-* Hodograph improvements
-    * Can now click and drag the storm-motion vectors, updating all the other insets
-    * Double click to change which storm motion vector is used for storm-relative calculations
-    * New readout on the hodograph, coupled to the readout on the Skew-T
+* Can now click and drag the storm-motion vectors, updating all the other insets
+* Double click to change which storm motion vector is used for storm-relative calculations
+* New readout on the hodograph, coupled to the readout on the Skew-T
 * Improvements for southern-hemisphere users
-    * Wind barbs are flipped
-    * Left-mover vector is used by default
-    * Storm motion vector is chosen if the SPC-formatted sounding file specifies the latitude and longitude of the input sounding (southern-hemisphere uses the left-mover, northern the right-mover).
-    * Left-mover vector is used in all other storm-motion dependent functions (e.g., STP insets, SARS).
-* New data sources for international and U.S. users
-    * Realtime and historical U.S. and international soundings from 1946-now are accessible through the Picker. Soundings include the latitude and longitude.
-    * IEM BUFKIT sounding archive (data back to 2010 from RUC, NAM, GFS, RAP)
+* Storm motion vector is chosen if the SPC-formatted sounding file specifies the latitude and longitude of the input sounding (southern-hemisphere uses the left-mover, northern the right-mover).
+* Left-mover vector is used in all other storm-motion dependent functions (e.g., STP insets, SARS).
+* Realtime and historical U.S. and international soundings from 1946-now are accessible through the Picker. Soundings include the latitude and longitude.
+* IEM BUFKIT sounding archive (data back to 2010 from RUC, NAM, GFS, RAP)
 * New documentation and API accessible through Github pages
-    * Improved documentation online (no longer in README)
-    * Documentation and sphinx-generated API is pushed to Github Pages with each tagged release.
+* Improved documentation online (no longer in README)
+* Documentation and sphinx-generated API is pushed to Github Pages with each tagged release.
 * Readout cursor can be configured to output other variables (e.g., potential temperature, theta-E)
 * Ability to modify surface by changing the surface temperature or dewpoint (mixed layer optional) 
 * Up/down buttons on keyboard can now be used to flip through the ensemble members plotted in the SHARPpy GUI.

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:2.7
+
+RUN apt-get -y update \
+    && apt-get install -y libqt4-dev cmake xvfb
+
+RUN pip install numpy==1.13 pyside==1.2.4
+
+COPY . /sharppy
+WORKDIR /sharppy
+RUN python setup.py install
+
+WORKDIR /sharppy/runsharp
+CMD python full_gui.py

README.md

@@ -66,10 +66,9 @@ __Required Python Packages/Libraries:__
 
 Since SHARPpy requires the qtpy and Numpy packages, you will need to install them.  If you choose to use the Anaconda distribution, Numpy comes installed by default.  qtpy can be installed through the Anaconda package manager that comes with the Anaconda distribution by opening up your command line program (Terminal in Mac OS X/Linux and Command Prompt in Windows) and typing:
 
-* NumPy
 * qtpy
 * NumPy v1.15
-* PySide2
+* PySide2 v5.13
 * requests
 * python-dateutil
 

azure-pipelines.yml

@@ -1,7 +1,11 @@
 # MUST CHANGE TRIGGER SO BUILDS HAPPEN ON OTHER BRANCHES AND PULL REQUESTS
 trigger:
-- andover
-
+  branches:
+    include:
+      - andover
+  tags:
+    include:
+      - v*
 # Setup build strategy (listing the various VMs and configurations we'll use)
 strategy:
   matrix:
@@ -55,7 +59,12 @@ steps:
 #    createCustomEnvironment: true
 
 - script: conda env create --quiet --file environment.yml
-  displayName: Create Anaconda environment
+  displayName: Create Anaconda environment (*nix)
+  condition: or( eq( variables['Agent.OS'], 'Darwin' ), eq( variables['Agent.OS'], 'Linux' ))
+
+- script: conda env create --quiet --file ci/env-win-binary.yml
+  displayName: Create Anaconda environment (Windows)
+  condition: eq( variables['Agent.OS'], 'Windows_NT')
 
 # Output the conda environment packages and which python and pip is being used (for diagnostic purposes)
 - script: which python & which pip & which pyinstaller & conda list
@@ -71,7 +80,7 @@ steps:
     xdpyinfo | grep dimensions # Check display dimensions
     python ci/screen.py # Check display dimensions as seen by PySide
     pytest -v --junitxml=junit/test-results.xml
-    #mv examples/data/14061619.png examples/data/14061619_linux.png
+    mv examples/data/14061619.png examples/data/14061619_linux.png
   displayName: "Installing code and running tests (Linux)"
   condition: eq( variables['Agent.OS'], 'Linux')
 
@@ -89,11 +98,13 @@ steps:
     python ci/screen.py # Check display dimensions as seen by PySide
     pip install -e .
     sudo pytest -v --junitxml=junit/test-results.xml
-    #sudo mv examples/data/14061619.png examples/data/14061619_mac.png
-    pyinstaller runsharp/SHARPpy-osx.spec --noconsole --onefile --log-level DEBUG
-    #sudo chmod 777 dist/SHARPpy.app
+    sudo mv examples/data/14061619.png examples/data/14061619_mac.png
     cd runsharp
-    ls -lh dist
+    pyinstaller SHARPpy-osx.spec --noconsole --onefile --log-level DEBUG
+    cd ..
+    #sudo chmod 777 dist/SHARPpy.app
+    #cd runsharp
+    #ls -lh dist
   displayName: "Installing code and running tests (macOS)"
   condition: eq( variables['Agent.OS'], 'Darwin')
 
@@ -108,10 +119,11 @@ steps:
 - script: |
     call activate devel
     python ci/screen.py
+    python -c "import ssl; print(ssl.__file__)"
     #SET PYTHONPATH=%PYTHONPATH%;%CD%
     pip install -e .
     pytest -v --junitxml=junit/test-results.xml
-    #move examples\\data\\14061619.png examples\\data\\14061619_win.png
+    move examples\\data\\14061619.png examples\\data\\14061619_win.png
     cd runsharp
     pyinstaller SHARPpy-win7-64.spec --log-level DEBUG
     cd ..
@@ -164,6 +176,7 @@ steps:
     isDraft: true # Optional
     isPreRelease: true # Optional
     addChangeLog: true # Optional
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
 
 # Copy GUI screenshots to the artifacts directory
 - task: CopyFiles@2