Merge pull request #560 from SheffieldML/devel

appveyor twine upload error fix

.appveyor_twine_upload.bat

@@ -0,0 +1,5 @@
+IF "%APPVEYOR_REPO_BRANCH%"=="deploy" (
+  twine upload --skip-existing dist/*
+) ELSE (
+  ECHO Only deploy on deploy branch
+)

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## v1.8.4 (2017-10-06)
+
+### Other
+
+* Bump version: 1.8.3 → 1.8.4. [mzwiessele]
+
+* Update appveyor.yml. [Max Zwiessele]
+
+* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [mzwiessele]
+
+* Merge branch 'deploy' into devel. [Max Zwiessele]
+
+* Merge pull request #557 from SheffieldML/devel. [Max Zwiessele]
+
+  Paramz 0.8 update
+
+* Merge pull request #544 from SheffieldML/devel. [Zhenwen Dai]
+
+  Release GPy 1.8.x
+
+
 ## v1.8.3 (2017-10-02)
 
 ### Fix

GPy/__version__.py

@@ -1 +1 @@
-__version__ = "1.8.3"
+__version__ = "1.8.4"

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.8.3
+  gpy_version: 1.8.4
   matrix:
     - PYTHON_VERSION: 2.7
       MINICONDA: C:\Miniconda-x64
@@ -48,7 +48,7 @@ test_script:
   - "coverage run travis_tests.py"
 
 after_test:
-  # This step builds your wheels.
+  This step builds your wheels.
   - "python setup.py bdist_wheel bdist_wininst"
   - codecov
   
@@ -71,16 +71,7 @@ deploy_script:
 - echo repository = https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc
 - echo username = maxz >> %USERPROFILE%\\.pypirc
 - echo password = %pip_access% >> %USERPROFILE%\\.pypirc
-- ps: >-
-    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 {
-        echo not deploying on other branches
-    }
+- .appveyor_twine_upload.bat
  
 # deploy:
 #   - provider: GitHub
@@ -91,4 +82,4 @@ deploy_script:
 #     prerelease: false
 #     on:
 #         branch: deploy                 # release from deploy branch only
-#         appveyor_repo_tag: true        # deploy on tag push only
+#         appveyor_repo_tag: true        # deploy on tag push only

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.8.3
+current_version = 1.8.4
 tag = True
 commit = True