Merge branch 'andover' of https://github.com/sharppy/SHARPpy into and…

…over

.travis.yml

@@ -11,15 +11,15 @@ matrix:
   - os: linux
     language: generic
     env: 
-      - PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.15 DISPLAY_AVAIL="YES"
+      - 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_DOCS="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="NO" NUMPY_VERSION=1.15 COVERALLS="YES" DISPLAY_AVAIL="YES"
+      - PYTHON_VERSION="3.6" BUILD_DOCS="NO" NUMPY_VERSION=1.17 COVERALLS="YES" DISPLAY_AVAIL="YES"
 
 addons:
   ssh_known_hosts: 
@@ -60,7 +60,7 @@ deploy:
    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
@@ -82,5 +82,5 @@ deploy:
      repo: sharppy/SHARPpy
      tags: true
      branch: andover-off
-     condition: "$BUILD_CONDA = YES"
+     condition: "$BUILD_CONDA = YESS"
 

azure-pipelines.yml

@@ -3,9 +3,9 @@ trigger:
   branches:
     include:
       - andover
-#  tags:
-#    include:
-#      - v*
+  tags:
+    include:
+      - v*
 # Setup build strategy (listing the various VMs and configurations we'll use)
 strategy:
   matrix:
@@ -176,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

docs/source/install.rst

@@ -13,6 +13,9 @@ SHARPpy can be installed from one of these three places:
 
 Binary executables are available for Windows (64 bit) and macOS 10.6+ (Snow Leopard and later; 64 bit only).
 
+**If you are upgrading your version of SHARPpy, you may need to delete your ~/.sharppy folder as 
+the files in that directory may be incompatable with the new version of SHARPpy.**
+
 Installing a pre-compiled binary
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

environment.yml

@@ -5,8 +5,8 @@ channels:
   - anaconda
 dependencies:
   - python=3
-  - numpy=1.15.*
-  - pyside2=5.12.*
+  - numpy>=1.15
+  - pyside2>=5.12
   - sphinx
   - pytest
   - qtpy

runsharp/SHARPpy-win7-64.spec

@@ -64,7 +64,7 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           name='SHARPpy.exe',
-          debug=True,
+          debug=False,
           strip=None,
           upx=True,
           console=False, icon='icons\\SHARPpy.ico')

runsharp/full_gui.py

@@ -884,9 +884,9 @@ def __initUI(self):
 
         self.show()
         self.raise_()
-        import time
-        time.sleep(3)
-        self.grab().save('./screenshot.png', 'png')
+        #import time
+        #time.sleep(3)
+        #self.grab().save('./screenshot.png', 'png')
 
     def createMenuBar(self):
         """

setup.py

@@ -30,15 +30,15 @@
 include_package_data = True
 
 #install_requires = []
-install_requires = ['python-dateutil', 'requests', 'numpy==1.15.*']
+install_requires = ['python-dateutil', 'requests', 'numpy>=1.15', 'qtpy']
 # Because pip doesn't recognize it when PySide is installed by conda from conda-forge
 # Try to import PySide.  If it fails, add the PySide to the install_requires
 # Because of this, the conda meta.yaml will require PySide to build SHARPpy
 #try:
-#    import PySide
+#    import qtpy
 #    print("Success importing PySide")
 #except:
-#    install_requires.append("PySide==1.2.*")    
+#    install_requires.append("PySide2==5.12.*")    
 
 entry_pts = {"console_scripts": ['sharppy = runsharp.full_gui:main'] }
 # Create some directory variables to shorten the lines.