From 37d1749694110e7e81f1f084d45b9fd7eb8ed77f Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Fri, 6 Oct 2017 13:27:59 +0100 Subject: [PATCH 1/7] Update appveyor.yml --- appveyor.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index da9b0c95..1ba9fc4c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,7 @@ test_script: # the interpreter you're using - Appveyor does not do anything special # to put the Python evrsion you want to use on PATH. #- "build.cmd %PYTHON%\\python.exe setup.py test" - - "coverage run travis_tests.py" + #- "coverage run travis_tests.py" after_test: # This step builds your wheels. @@ -71,16 +71,17 @@ 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 - } +- echo %APPVEYOR_REPO_BRANCH% +#- 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 +# } # deploy: # - provider: GitHub @@ -91,4 +92,4 @@ deploy_script: # prerelease: false # on: # branch: deploy # release from deploy branch only -# appveyor_repo_tag: true # deploy on tag push only \ No newline at end of file +# appveyor_repo_tag: true # deploy on tag push only From d0513315c7bb8a56c334bb0b902d17aadaa4ca37 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 6 Oct 2017 13:49:58 +0100 Subject: [PATCH 2/7] fix: pkg: appveyor build without ps --- .appveyor_twine_upload.bat | 22 ++++++++++++++++++++++ appveyor.yml | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .appveyor_twine_upload.bat diff --git a/.appveyor_twine_upload.bat b/.appveyor_twine_upload.bat new file mode 100644 index 00000000..2397a997 --- /dev/null +++ b/.appveyor_twine_upload.bat @@ -0,0 +1,22 @@ +IF "%APPVEYOR_REPO_BRANCH%"=="deploy" ( + ECHO "twine upload --skip-existing dist/*" 1>&2 +) ELSE ( + ECHO Only deploy on deploy branch +) + + + + echo not deploying on other branches, other than deploy + + + +#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 +# } \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 1ba9fc4c..13b5c2df 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -71,7 +71,7 @@ deploy_script: - echo repository = https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username = maxz >> %USERPROFILE%\\.pypirc - echo password = %pip_access% >> %USERPROFILE%\\.pypirc -- echo %APPVEYOR_REPO_BRANCH% +- .appveyor_twine_upload.bat #- ps: >- # If ($env:APPVEYOR_REPO_BRANCH -eq 'devel') { # echo not deploying on devel # twine upload --skip-existing -r test dist/* From f7f8f31b0c0f1febd94af35d606e8c1e09b0a61c Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 6 Oct 2017 13:52:14 +0100 Subject: [PATCH 3/7] fix: pkg: faster throughput: --- .appveyor_twine_upload.bat | 19 +------------------ appveyor.yml | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 36 deletions(-) diff --git a/.appveyor_twine_upload.bat b/.appveyor_twine_upload.bat index 2397a997..8984c8d7 100644 --- a/.appveyor_twine_upload.bat +++ b/.appveyor_twine_upload.bat @@ -2,21 +2,4 @@ IF "%APPVEYOR_REPO_BRANCH%"=="deploy" ( ECHO "twine upload --skip-existing dist/*" 1>&2 ) ELSE ( ECHO Only deploy on deploy branch -) - - - - echo not deploying on other branches, other than deploy - - - -#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 -# } \ No newline at end of file +) \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 13b5c2df..aafadbed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,22 +17,22 @@ environment: # - Release install: - - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - - conda info -a - - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib" - - activate build-environment - # We need wheel installed to build wheels - - python -m pip install wheel - # GPy needs paramz - - python -m pip install paramz - - python -m pip install nose-show-skipped - - python -m pip install coverage - - python -m pip install coveralls - - python -m pip install codecov - - python -m pip install twine - - "python setup.py develop" + # - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" + # - conda config --set always_yes yes --set changeps1 no + # - conda update -q conda + # - conda info -a + # - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib" + # - activate build-environment + # # We need wheel installed to build wheels + # - python -m pip install wheel + # # GPy needs paramz + # - python -m pip install paramz + # - python -m pip install nose-show-skipped + # - python -m pip install coverage + # - python -m pip install coveralls + # - python -m pip install codecov + # - python -m pip install twine + # - "python setup.py develop" build: off @@ -49,8 +49,8 @@ test_script: after_test: # This step builds your wheels. - - "python setup.py bdist_wheel bdist_wininst" - - codecov + # - "python setup.py bdist_wheel bdist_wininst" + # - codecov artifacts: # bdist_wheel puts your built wheel in the dist directory From d821a2659dee624672b57bdce001384a25246891 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 6 Oct 2017 13:54:34 +0100 Subject: [PATCH 4/7] fix: pkg: faster throughput: --- .appveyor_twine_upload.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor_twine_upload.bat b/.appveyor_twine_upload.bat index 8984c8d7..bc99a19b 100644 --- a/.appveyor_twine_upload.bat +++ b/.appveyor_twine_upload.bat @@ -1,5 +1,5 @@ IF "%APPVEYOR_REPO_BRANCH%"=="deploy" ( ECHO "twine upload --skip-existing dist/*" 1>&2 ) ELSE ( - ECHO Only deploy on deploy branch + ECHO Only deploy on deploy branch 1>&2 ) \ No newline at end of file From 393e8a289363c18b5c75e5e1c85755c5f5202944 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 6 Oct 2017 13:57:11 +0100 Subject: [PATCH 5/7] fix: pkg: appveyor upload stderr using twine --- .appveyor_twine_upload.bat | 4 +-- appveyor.yml | 50 +++++++++++++++----------------------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/.appveyor_twine_upload.bat b/.appveyor_twine_upload.bat index bc99a19b..cb7ca064 100644 --- a/.appveyor_twine_upload.bat +++ b/.appveyor_twine_upload.bat @@ -1,5 +1,5 @@ IF "%APPVEYOR_REPO_BRANCH%"=="deploy" ( - ECHO "twine upload --skip-existing dist/*" 1>&2 + twine upload --skip-existing dist/* ) ELSE ( - ECHO Only deploy on deploy branch 1>&2 + ECHO Only deploy on deploy branch ) \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index aafadbed..bbb268d2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,22 +17,22 @@ environment: # - Release install: - # - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - # - conda config --set always_yes yes --set changeps1 no - # - conda update -q conda - # - conda info -a - # - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib" - # - activate build-environment - # # We need wheel installed to build wheels - # - python -m pip install wheel - # # GPy needs paramz - # - python -m pip install paramz - # - python -m pip install nose-show-skipped - # - python -m pip install coverage - # - python -m pip install coveralls - # - python -m pip install codecov - # - python -m pip install twine - # - "python setup.py develop" + - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" + - conda config --set always_yes yes --set changeps1 no + - conda update -q conda + - conda info -a + - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib" + - activate build-environment + # We need wheel installed to build wheels + - python -m pip install wheel + # GPy needs paramz + - python -m pip install paramz + - python -m pip install nose-show-skipped + - python -m pip install coverage + - python -m pip install coveralls + - python -m pip install codecov + - python -m pip install twine + - "python setup.py develop" build: off @@ -45,12 +45,12 @@ test_script: # the interpreter you're using - Appveyor does not do anything special # to put the Python evrsion you want to use on PATH. #- "build.cmd %PYTHON%\\python.exe setup.py test" - #- "coverage run travis_tests.py" + - "coverage run travis_tests.py" after_test: - # This step builds your wheels. - # - "python setup.py bdist_wheel bdist_wininst" - # - codecov + This step builds your wheels. + - "python setup.py bdist_wheel bdist_wininst" + - codecov artifacts: # bdist_wheel puts your built wheel in the dist directory @@ -72,16 +72,6 @@ deploy_script: - echo username = maxz >> %USERPROFILE%\\.pypirc - echo password = %pip_access% >> %USERPROFILE%\\.pypirc - .appveyor_twine_upload.bat -#- 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 -# } # deploy: # - provider: GitHub From f8c3611ae64ad80a9225b2ddb099594f02876814 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 6 Oct 2017 13:59:20 +0100 Subject: [PATCH 6/7] =?UTF-8?q?Bump=20version:=201.8.3=20=E2=86=92=201.8.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GPy/__version__.py | 2 +- appveyor.yml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GPy/__version__.py b/GPy/__version__.py index a44132de..22944760 100644 --- a/GPy/__version__.py +++ b/GPy/__version__.py @@ -1 +1 @@ -__version__ = "1.8.3" +__version__ = "1.8.4" diff --git a/appveyor.yml b/appveyor.yml index bbb268d2..b435a466 100644 --- a/appveyor.yml +++ b/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 diff --git a/setup.cfg b/setup.cfg index 2cf9e856..5e65d264 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.8.3 +current_version = 1.8.4 tag = True commit = True From 46902225bdac544550080c23d2578650ee642ac3 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 6 Oct 2017 14:00:40 +0100 Subject: [PATCH 7/7] fix: pkg: CHANGELOG --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88d728b8..a6f27fd5 100644 --- a/CHANGELOG.md +++ b/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