Merge branch 'devel' into deploy

GPy/__version__.py

@@ -1 +1 @@
-__version__ = "1.7.6"
+__version__ = "1.7.7"

appveyor.yml

@@ -3,7 +3,7 @@ environment:
     secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00=
   COVERALLS_REPO_TOKEN:
     secure: d3Luic/ESkGaWnZrvWZTKrzO+xaVwJWaRCEP0F+K/9DQGPSRZsJ/Du5g3s4XF+tS
-  gpy_version: 1.7.6
+  gpy_version: 1.7.7
   matrix:
     - PYTHON_VERSION: 2.7
       MINICONDA: C:\Miniconda-x64
@@ -72,17 +72,16 @@ deploy_script:
 - echo username = maxz >> %USERPROFILE%\\.pypirc
 - echo password = %pip_access% >> %USERPROFILE%\\.pypirc
 - ps: >-
-    if ($env:APPVEYOR_REPO_BRANCH -eq 'deploy') {  
+    If ($env:APPVEYOR_REPO_BRANCH -eq 'devel') { 
+        echo not deploying on devel # twine upload --skip-existing -r test dist/*
+    }
+    ElseIf ($env:APPVEYOR_REPO_BRANCH -eq 'deploy') {  
         twine upload --skip-existing dist/*
     }
-    else {
+    Else {
         echo not deploying on other branches
     }
  
-# if ($env:APPVEYOR_REPO_BRANCH -eq 'devel') { 
-#     twine upload --skip-existing -r test dist/*
-# } # This is for testing the upload to testpypi, it causes a fail, so we will undo it here
-
 # deploy:
 #   - provider: GitHub
 #     release: GPy-v$(gpy_version)

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.7.6
+current_version = 1.7.7
 tag = True
 commit = True