From dc5867815aecf013358455ba7d8d6133c446694f Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Wed, 22 Jun 2016 08:29:42 +0100 Subject: [PATCH 01/70] [#403] fix of inconsistent config naming --- GPy/util/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GPy/util/config.py b/GPy/util/config.py index e47848a8..53675efe 100644 --- a/GPy/util/config.py +++ b/GPy/util/config.py @@ -12,7 +12,7 @@ except ImportError: import configparser config = configparser.ConfigParser() from configparser import NoOptionError - + # This is the default configuration file that always needs to be present. default_file = os.path.abspath(os.path.join(os.path.dirname( __file__ ), '..', 'defaults.cfg')) @@ -23,7 +23,7 @@ local_file = os.path.abspath(os.path.join(os.path.dirname( __file__ ), '..', 'in # This specifies configurations specific to the user (it is found in the user home directory) home = os.getenv('HOME') or os.getenv('USERPROFILE') -user_file = os.path.join(home,'.config','gpy', 'user.cfg') +user_file = os.path.join(home,'.config','GPy', 'user.cfg') # Read in the given files. config.readfp(open(default_file)) From f3359b7ad48fbbbbed30160e748d6c663b6fcdbd Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Wed, 22 Jun 2016 08:34:34 +0100 Subject: [PATCH 02/70] [imports] fix #392 --- GPy/mappings/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GPy/mappings/__init__.py b/GPy/mappings/__init__.py index 39568c9f..73390b87 100644 --- a/GPy/mappings/__init__.py +++ b/GPy/mappings/__init__.py @@ -7,4 +7,6 @@ from .mlp import MLP from .additive import Additive from .compound import Compound from .constant import Constant +from .identity import Identity +from .piecewise_linear import PiecewiseLinear From 83ae7cb5772006554de1d6736bacfc3e0f439e3d Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Wed, 22 Jun 2016 09:01:28 +0100 Subject: [PATCH 03/70] [py3] iterator .next fixes --- GPy/plotting/matplot_dep/variational_plots.py | 4 ++-- GPy/util/pca.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GPy/plotting/matplot_dep/variational_plots.py b/GPy/plotting/matplot_dep/variational_plots.py index ca8b1e86..3f20efeb 100644 --- a/GPy/plotting/matplot_dep/variational_plots.py +++ b/GPy/plotting/matplot_dep/variational_plots.py @@ -34,7 +34,7 @@ def plot(parameterized, fignum=None, ax=None, colors=None, figsize=(12, 6)): else: raise ValueError("Need one ax per latent dimension input_dim") bg_lines.append(a.plot(means, c='k', alpha=.3)) - lines.extend(a.plot(x, means.T[i], c=colors.next(), label=r"$\mathbf{{X_{{{}}}}}$".format(i))) + lines.extend(a.plot(x, means.T[i], c=next(colors), label=r"$\mathbf{{X_{{{}}}}}$".format(i))) fills.append(a.fill_between(x, means.T[i] - 2 * np.sqrt(variances.T[i]), means.T[i] + 2 * np.sqrt(variances.T[i]), @@ -86,7 +86,7 @@ def plot_SpikeSlab(parameterized, fignum=None, ax=None, colors=None, side_by_sid # mean and variance plot a = fig.add_subplot(*sub1) a.plot(means, c='k', alpha=.3) - plots.extend(a.plot(x, means.T[i], c=colors.next(), label=r"$\mathbf{{X_{{{}}}}}$".format(i))) + plots.extend(a.plot(x, means.T[i], c=next(colors), label=r"$\mathbf{{X_{{{}}}}}$".format(i))) a.fill_between(x, means.T[i] - 2 * np.sqrt(variances.T[i]), means.T[i] + 2 * np.sqrt(variances.T[i]), diff --git a/GPy/util/pca.py b/GPy/util/pca.py index edb8bb7d..3bfcacd9 100644 --- a/GPy/util/pca.py +++ b/GPy/util/pca.py @@ -131,7 +131,7 @@ class PCA(object): kwargs.update(dict(s=s)) plots = list() for i, l in enumerate(ulabels): - kwargs.update(dict(color=colors.next(), marker=marker[i % len(marker)])) + kwargs.update(dict(color=next(colors), marker=marker[i % len(marker)])) plots.append(ax.scatter(*X_[labels == l, :].T, label=str(l), **kwargs)) ax.set_xlabel(r"PC$_1$") ax.set_ylabel(r"PC$_2$") From ad834330af95571026fdf4a067a601bcf920b033 Mon Sep 17 00:00:00 2001 From: Ricardo Andrade Date: Fri, 24 Jun 2016 11:02:59 -0700 Subject: [PATCH 04/70] trying to be more specific --- GPy/models/gp_coregionalized_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPy/models/gp_coregionalized_regression.py b/GPy/models/gp_coregionalized_regression.py index c8ee5f67..66edb8d7 100644 --- a/GPy/models/gp_coregionalized_regression.py +++ b/GPy/models/gp_coregionalized_regression.py @@ -17,7 +17,7 @@ class GPCoregionalizedRegression(GP): :type X_list: list of numpy arrays :param Y_list: list of observed values related to the different noise models :type Y_list: list of numpy arrays - :param kernel: a GPy kernel, defaults to RBF ** Coregionalized + :param kernel: a GPy kernel ** Coregionalized, defaults to RBF ** Coregionalized :type kernel: None | GPy.kernel defaults :likelihoods_list: a list of likelihoods, defaults to list of Gaussian likelihoods :type likelihoods_list: None | a list GPy.likelihoods From 893b9a7eba8dcb1aae5188bbdf3de13980f693ac Mon Sep 17 00:00:00 2001 From: Ricardo Andrade Date: Fri, 24 Jun 2016 11:03:38 -0700 Subject: [PATCH 05/70] trying to be more specific --- GPy/models/sparse_gp_coregionalized_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPy/models/sparse_gp_coregionalized_regression.py b/GPy/models/sparse_gp_coregionalized_regression.py index 2997993e..88841891 100644 --- a/GPy/models/sparse_gp_coregionalized_regression.py +++ b/GPy/models/sparse_gp_coregionalized_regression.py @@ -19,7 +19,7 @@ class SparseGPCoregionalizedRegression(SparseGP): :type Y_list: list of numpy arrays :param Z_list: list of inducing inputs (optional) :type Z_list: empty list | list of numpy arrays - :param kernel: a GPy kernel, defaults to RBF ** Coregionalized + :param kernel: a GPy kernel ** Coregionalized, defaults to RBF ** Coregionalized :type kernel: None | GPy.kernel defaults :likelihoods_list: a list of likelihoods, defaults to list of Gaussian likelihoods :type likelihoods_list: None | a list GPy.likelihoods From b9c3a8a1632342f3d1d891afae3aefdb68f398c0 Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Thu, 7 Jul 2016 08:45:27 +0100 Subject: [PATCH 06/70] First attempt to use appveyor for windows builds --- appveyor.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..cf64d4e3 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,46 @@ +environment: + + matrix: + + # For Python versions available on Appveyor, see + # http://www.appveyor.com/docs/installed-software#python + # The list here is complete (excluding Python 2.6, which + # isn't covered by this document) at the time of writing. + + - PYTHON: "C:\\Python27-x64" + - PYTHON: "C:\\Python35-x64" + +install: + # We need wheel installed to build wheels + - "%PYTHON%\\python.exe -m pip install wheel" + - "%PYTHON%\\python.exe -m pip install scipy" + - "%PYTHON%\\python.exe -m pip install paramz" + - "%PYTHON%\\python.exe -m pip install matplotlib" + +build: off + +test_script: + # Put your test command here. + # If you don't need to build C extensions on 64-bit Python 3.3 or 3.4, + # you can remove "build.cmd" from the front of the command, as it's + # only needed to support those cases. + # Note that you must use the environment variable %PYTHON% to refer to + # 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" + +after_test: + # This step builds your wheels. + # Again, you only need build.cmd if you're building C extensions for + # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct + # interpreter + - "build.cmd %PYTHON%\\python.exe setup.py bdist_wheel" + +artifacts: + # bdist_wheel puts your built wheel in the dist directory + - path: dist\* + +#on_success: +# You can use this step to upload your artifacts to a public website. +# See Appveyor's documentation for more details. Or you can simply +# access your wheels from the Appveyor "artifacts" tab for your build. From ad98495c2337cf73474a3ea717ab1d6a809ce1e5 Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Thu, 7 Jul 2016 08:50:28 +0100 Subject: [PATCH 07/70] Appveyor: Only build the deploy branch --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index cf64d4e3..ff13f99d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,10 @@ environment: - PYTHON: "C:\\Python27-x64" - PYTHON: "C:\\Python35-x64" +branches: + only: + - deploy + install: # We need wheel installed to build wheels - "%PYTHON%\\python.exe -m pip install wheel" From 801e6173adc5d5082eb3add05d7621bf0d5b0109 Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Thu, 7 Jul 2016 09:34:04 +0100 Subject: [PATCH 08/70] Appveyor: Use Miniconda for numpy and scipy --- appveyor.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ff13f99d..cd9bc881 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,25 +1,24 @@ environment: matrix: - - # For Python versions available on Appveyor, see - # http://www.appveyor.com/docs/installed-software#python - # The list here is complete (excluding Python 2.6, which - # isn't covered by this document) at the time of writing. - - - PYTHON: "C:\\Python27-x64" - - PYTHON: "C:\\Python35-x64" + - PYTHON_VERSION: 2.7 + MINICONDA: C:\Miniconda branches: only: - deploy -install: +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%\\python.exe -m pip install wheel" - - "%PYTHON%\\python.exe -m pip install scipy" + # GPy needs paramz - "%PYTHON%\\python.exe -m pip install paramz" - - "%PYTHON%\\python.exe -m pip install matplotlib" build: off From d6a6bcbb9bed2968fd0aa285fa9f3a092276791f Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Thu, 7 Jul 2016 10:35:11 +0100 Subject: [PATCH 09/70] Appveyor bug fix --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cd9bc881..e73f5d21 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,9 +16,9 @@ install: - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib" - activate build-environment # We need wheel installed to build wheels - - "%PYTHON%\\python.exe -m pip install wheel" + - python -m pip install wheel" # GPy needs paramz - - "%PYTHON%\\python.exe -m pip install paramz" + - python -m pip install paramz" build: off From 60ca6a8c9ac5e2218e1a50b99920fefae2a9ff6d Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Thu, 7 Jul 2016 10:53:40 +0100 Subject: [PATCH 10/70] Another appveyor bug fix --- appveyor.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e73f5d21..630fae44 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,10 +34,7 @@ test_script: after_test: # This step builds your wheels. - # Again, you only need build.cmd if you're building C extensions for - # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct - # interpreter - - "build.cmd %PYTHON%\\python.exe setup.py bdist_wheel" + - "python setup.py bdist_wheel" artifacts: # bdist_wheel puts your built wheel in the dist directory From 04ce73b858b372bdb60aa098b913f2f3e409c5c5 Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Thu, 7 Jul 2016 13:22:49 +0100 Subject: [PATCH 11/70] Appveyor: Py27 and Py35 builds --- appveyor.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 630fae44..c4983d85 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,13 +2,17 @@ environment: matrix: - PYTHON_VERSION: 2.7 - MINICONDA: C:\Miniconda + MINICONDA: C:\Miniconda-x64 + - PYTHON_VERSION: 3.5 + MINICONDA: C:\Miniconda35-x64 + + branches: only: - deploy -install: +install: - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - conda config --set always_yes yes --set changeps1 no - conda update -q conda From f1078fa8fc21759978b3ce9ec71bffcdb47bba47 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 08:51:20 +0100 Subject: [PATCH 12/70] [secure] password added to appveyor --- appveyor.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c4983d85..7b2526bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,6 @@ environment: + pip_upload: + secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= matrix: - PYTHON_VERSION: 2.7 @@ -20,9 +22,9 @@ install: - "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" + - python -m pip install wheel # GPy needs paramz - - python -m pip install paramz" + - python -m pip install paramz build: off @@ -35,6 +37,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" + - "python setup.py test" after_test: # This step builds your wheels. @@ -44,6 +47,12 @@ artifacts: # bdist_wheel puts your built wheel in the dist directory - path: dist\* +deploy_script: + - "echo [pypi] > %USERPROFILE%\\.pypirc" + - "echo username: user >> %USERPROFILE%\\.pypirc" + - "echo password: %pip_upload% >> %USERPROFILE%\\.pypirc" + - python setup.py bdist_wheel upload + #on_success: # You can use this step to upload your artifacts to a public website. # See Appveyor's documentation for more details. Or you can simply From d471d875b89d4ed838f3b5fb7ad06fc4b7904208 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 08:53:38 +0100 Subject: [PATCH 13/70] =?UTF-8?q?Bump=20version:=201.0.9=20=E2=86=92=201.1?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GPy/__version__.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GPy/__version__.py b/GPy/__version__.py index 39e0411d..6849410a 100644 --- a/GPy/__version__.py +++ b/GPy/__version__.py @@ -1 +1 @@ -__version__ = "1.0.9" +__version__ = "1.1.0" diff --git a/setup.cfg b/setup.cfg index 0f00211e..fa2eb911 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.9 +current_version = 1.1.0 tag = False commit = True From 5b50184ff3f1df147ac4bb0cc910365265842cca Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 08:56:43 +0100 Subject: [PATCH 14/70] [appveyor] user --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7b2526bb..20506e93 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -49,7 +49,7 @@ artifacts: deploy_script: - "echo [pypi] > %USERPROFILE%\\.pypirc" - - "echo username: user >> %USERPROFILE%\\.pypirc" + - "echo username: maxz >> %USERPROFILE%\\.pypirc" - "echo password: %pip_upload% >> %USERPROFILE%\\.pypirc" - python setup.py bdist_wheel upload From a64d53c3be7d906ab4cc3ce26ccf46313364fb7b Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 09:11:47 +0100 Subject: [PATCH 15/70] [appveyor] tests --- appveyor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 20506e93..4ba74aed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,6 +25,8 @@ install: - 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 build: off @@ -37,7 +39,8 @@ 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" - - "python setup.py test" + - "build.cmd python setup.py develop" + - "coverage run travis_tests.py" after_test: # This step builds your wheels. From d71a2aaebc4a0a7e4fd655e7b95be9e58ad8b06e Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 09:23:24 +0100 Subject: [PATCH 16/70] [py33] removed from builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cfa0d351..7a35d6b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ addons: env: - PYTHON_VERSION=2.7 - - PYTHON_VERSION=3.3 + #- PYTHON_VERSION=3.3 - PYTHON_VERSION=3.4 - PYTHON_VERSION=3.5 From 40fe3d213af62fafe525c6d2deeb4571d847b50e Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 09:40:24 +0100 Subject: [PATCH 17/70] [appveyor] build script --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4ba74aed..29d8f1cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,6 +27,7 @@ install: - python -m pip install paramz - python -m pip install nose-show-skipped - python -m pip install coverage + - "python setup.py develop" build: off @@ -39,7 +40,6 @@ 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" - - "build.cmd python setup.py develop" - "coverage run travis_tests.py" after_test: From 06497922f78d9a1fc26f08fadf4f36eeb3dd8c17 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 09:48:57 +0100 Subject: [PATCH 18/70] [tests] skip on climin import error --- GPy/testing/minibatch_tests.py | 48 ++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/GPy/testing/minibatch_tests.py b/GPy/testing/minibatch_tests.py index fbf12939..09bcc1dc 100644 --- a/GPy/testing/minibatch_tests.py +++ b/GPy/testing/minibatch_tests.py @@ -127,28 +127,32 @@ class SparseGPMinibatchTest(unittest.TestCase): def test_sparsegp_init(self): # Test if the different implementations give the exact same likelihood as the full model. # All of the following settings should give the same likelihood and gradients as the full model: - np.random.seed(1234) - Z = self.X[np.random.choice(self.X.shape[0], replace=False, size=10)].copy() - Q = Z.shape[1] - m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=True, stochastic=False) - assert(m.checkgrad()) - m.optimize('adadelta', max_iters=10) - assert(m.checkgrad()) - - m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=True, stochastic=True) - assert(m.checkgrad()) - m.optimize('rprop', max_iters=10) - assert(m.checkgrad()) - - m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=False, stochastic=False) - assert(m.checkgrad()) - m.optimize('rprop', max_iters=10) - assert(m.checkgrad()) - - m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=False, stochastic=True) - assert(m.checkgrad()) - m.optimize('adadelta', max_iters=10) - assert(m.checkgrad()) + try: + np.random.seed(1234) + Z = self.X[np.random.choice(self.X.shape[0], replace=False, size=10)].copy() + Q = Z.shape[1] + m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=True, stochastic=False) + assert(m.checkgrad()) + m.optimize('adadelta', max_iters=10) + assert(m.checkgrad()) + + m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=True, stochastic=True) + assert(m.checkgrad()) + m.optimize('rprop', max_iters=10) + assert(m.checkgrad()) + + m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=False, stochastic=False) + assert(m.checkgrad()) + m.optimize('rprop', max_iters=10) + assert(m.checkgrad()) + + m = GPy.models.sparse_gp_minibatch.SparseGPMiniBatch(self.X, self.Y, Z, GPy.kern.RBF(Q)+GPy.kern.Matern32(Q)+GPy.kern.Bias(Q), GPy.likelihoods.Gaussian(), missing_data=False, stochastic=True) + assert(m.checkgrad()) + m.optimize('adadelta', max_iters=10) + assert(m.checkgrad()) + except ImportError: + from nose import SkipTest + raise SkipTest('climin not installed, skipping stochastic gradients') def test_predict_missing_data(self): m = GPy.models.bayesian_gplvm_minibatch.BayesianGPLVMMiniBatch(self.Y, self.Q, X_variance=False, missing_data=True, stochastic=True, batchsize=self.Y.shape[1]) From 16b99c65b1499246dff03a39bbbfc97a2cee0108 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 09:57:11 +0100 Subject: [PATCH 19/70] [appveyor] on_success --- appveyor.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 29d8f1cf..7b643c25 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,13 +50,8 @@ artifacts: # bdist_wheel puts your built wheel in the dist directory - path: dist\* -deploy_script: +on_success: - "echo [pypi] > %USERPROFILE%\\.pypirc" - "echo username: maxz >> %USERPROFILE%\\.pypirc" - "echo password: %pip_upload% >> %USERPROFILE%\\.pypirc" - - python setup.py bdist_wheel upload - -#on_success: -# You can use this step to upload your artifacts to a public website. -# See Appveyor's documentation for more details. Or you can simply -# access your wheels from the Appveyor "artifacts" tab for your build. + - python setup.py bdist_wheel upload \ No newline at end of file From b3e99c79af0f61df71a02537e194e44809bb40a0 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 10:15:01 +0100 Subject: [PATCH 20/70] [appveyor] trying out github relesaessese --- appveyor.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7b643c25..66b03a93 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,6 +28,7 @@ install: - python -m pip install nose-show-skipped - python -m pip install coverage - "python setup.py develop" + - export `cat GPy/__version__.py | tr -d '[[:space:]]'` build: off @@ -44,7 +45,7 @@ test_script: after_test: # This step builds your wheels. - - "python setup.py bdist_wheel" + - "python setup.py bdist_wheel bdist_wininst bdist_wi" artifacts: # bdist_wheel puts your built wheel in the dist directory @@ -54,4 +55,18 @@ on_success: - "echo [pypi] > %USERPROFILE%\\.pypirc" - "echo username: maxz >> %USERPROFILE%\\.pypirc" - "echo password: %pip_upload% >> %USERPROFILE%\\.pypirc" - - python setup.py bdist_wheel upload \ No newline at end of file + - python setup.py bdist_wheel upload + + +deploy: + release: GPy-v$(__version__) + description: 'GPy windows install' + provider: GitHub + auth_token: + secure: a0f98391430517c6cdeb097c50d60d33f7131480 # your encrypted token from GitHub + artifact: dist\/.*\.exe/ # upload all NuGet packages to release assets + draft: false + prerelease: false + on: + branch: deploy # release from master branch only + #appveyor_repo_tag: true # deploy on tag push only \ No newline at end of file From fe00ef6dbbaca062b295bf94000153e86afcd57a Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 10:21:42 +0100 Subject: [PATCH 21/70] [appveyor] use twine --- appveyor.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 66b03a93..64fd5f88 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,6 +27,7 @@ install: - python -m pip install paramz - python -m pip install nose-show-skipped - python -m pip install coverage + - python -m pip install twine - "python setup.py develop" - export `cat GPy/__version__.py | tr -d '[[:space:]]'` @@ -45,7 +46,7 @@ test_script: after_test: # This step builds your wheels. - - "python setup.py bdist_wheel bdist_wininst bdist_wi" + - "python setup.py bdist_wheel bdist_wininst bdist_msi" artifacts: # bdist_wheel puts your built wheel in the dist directory @@ -55,7 +56,8 @@ on_success: - "echo [pypi] > %USERPROFILE%\\.pypirc" - "echo username: maxz >> %USERPROFILE%\\.pypirc" - "echo password: %pip_upload% >> %USERPROFILE%\\.pypirc" - - python setup.py bdist_wheel upload + - ls dist\ + - twine upload dist\*.wheel deploy: @@ -64,9 +66,9 @@ deploy: provider: GitHub auth_token: secure: a0f98391430517c6cdeb097c50d60d33f7131480 # your encrypted token from GitHub - artifact: dist\/.*\.exe/ # upload all NuGet packages to release assets + artifact: dist\*.exe # upload wininst to GitHub draft: false prerelease: false on: - branch: deploy # release from master branch only + branch: deploy # release from deploy branch only #appveyor_repo_tag: true # deploy on tag push only \ No newline at end of file From 925582e71e7608c3d3f6b88192c1abca3eb36359 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 10:23:55 +0100 Subject: [PATCH 22/70] [appveyor] use twine --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 64fd5f88..7665b76b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,8 +64,6 @@ deploy: release: GPy-v$(__version__) description: 'GPy windows install' provider: GitHub - auth_token: - secure: a0f98391430517c6cdeb097c50d60d33f7131480 # your encrypted token from GitHub artifact: dist\*.exe # upload wininst to GitHub draft: false prerelease: false From f264e2b79c57db955a54aab63d9ed8cf3c23cd3d Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 10:35:11 +0100 Subject: [PATCH 23/70] [appveyor] version in gh releases --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7665b76b..7f16eb6e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ install: - python -m pip install coverage - python -m pip install twine - "python setup.py develop" - - export `cat GPy/__version__.py | tr -d '[[:space:]]'` + - set `cat GPy/__version__.py | tr -d '[[:space:]]'` build: off @@ -46,7 +46,7 @@ test_script: after_test: # This step builds your wheels. - - "python setup.py bdist_wheel bdist_wininst bdist_msi" + - "python setup.py bdist_wheel bdist_wininst" artifacts: # bdist_wheel puts your built wheel in the dist directory @@ -57,7 +57,7 @@ on_success: - "echo username: maxz >> %USERPROFILE%\\.pypirc" - "echo password: %pip_upload% >> %USERPROFILE%\\.pypirc" - ls dist\ - - twine upload dist\*.wheel + - twine upload dist\*.whl deploy: From b59f6d46b7bacc6baba6417bd933c983bbc5d4b3 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 10:46:45 +0100 Subject: [PATCH 24/70] [appveyor] version in gh releases --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7f16eb6e..d6c16f35 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ install: - python -m pip install coverage - python -m pip install twine - "python setup.py develop" - - set `cat GPy/__version__.py | tr -d '[[:space:]]'` + - set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` build: off From 65006a9b351e9a58ee47706f44dc170e72ac9b98 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 10:56:35 +0100 Subject: [PATCH 25/70] [appveyor] upload is not working? --- appveyor.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d6c16f35..8e9f6c5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,10 +54,16 @@ artifacts: on_success: - "echo [pypi] > %USERPROFILE%\\.pypirc" - - "echo username: maxz >> %USERPROFILE%\\.pypirc" - - "echo password: %pip_upload% >> %USERPROFILE%\\.pypirc" + - "echo username:maxz >> %USERPROFILE%\\.pypirc" + - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" + - "echo '' >> %USERPROFILE%\\.pypirc" + - "echo [test] >> %USERPROFILE%\\.pypirc" + - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" + - "echo username:maxz >> %USERPROFILE%\\.pypirc" + - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" + - type %USERPROFILE%\\.pypirc - ls dist\ - - twine upload dist\*.whl + - twine upload -r test dist\*.whl deploy: From fc8cb8e29cc11ce8b93ca1f943e2b0d76e1aec06 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:07:50 +0100 Subject: [PATCH 26/70] [setup] more setup changes --- appveyor.yml | 25 ++++++++++++------------- setup.cfg | 3 --- setup.py | 13 +++---------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8e9f6c5e..592a4347 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,7 +42,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. @@ -63,16 +63,15 @@ on_success: - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" - type %USERPROFILE%\\.pypirc - ls dist\ - - twine upload -r test dist\*.whl + - twine upload -r test dist\* - -deploy: - release: GPy-v$(__version__) - description: 'GPy windows install' - provider: GitHub - artifact: dist\*.exe # upload wininst to GitHub - draft: false - 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 +#deploy: +# release: GPy-v$(__version__) +# description: 'GPy windows install' +# provider: GitHub +# artifact: dist\*.exe # upload wininst to GitHub +# draft: false +# 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 diff --git a/setup.cfg b/setup.cfg index fa2eb911..4c59444e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,9 +5,6 @@ commit = True [bumpversion:file:GPy/__version__.py] -[bdist_wheel] -universal = 1 - [upload_docs] upload-dir = doc/build/html diff --git a/setup.py b/setup.py index 18e0c7d8..c8d20add 100644 --- a/setup.py +++ b/setup.py @@ -59,14 +59,7 @@ def read_to_rst(fname): desc = """ -- `GPy homepage `_ -- `Tutorial notebooks `_ -- `User mailing-list `_ -- `Developer documentation `_ -- `Travis-CI unit-tests `_ -- `License `_ - -For full description and installation instructions please refer to the github page. +Please refer to the github homepage for detailed instructions on installation and usage. """ @@ -116,6 +109,7 @@ setup(name = 'GPy', author = read_to_rst('AUTHORS.txt'), author_email = "gpy.authors@gmail.com", description = ("The Gaussian Process Toolbox"), + long_description = desc, license = "BSD 3-clause", keywords = "machine-learning gaussian-processes kernels", url = "http://sheffieldml.github.com/GPy/", @@ -154,8 +148,7 @@ setup(name = 'GPy', include_package_data = True, py_modules = ['GPy.__init__'], test_suite = 'GPy.testing', - long_description=desc, - install_requires=['numpy>=1.7', 'scipy>=0.16', 'six', 'paramz>=0.5.2'], + install_requires = ['numpy>=1.7', 'scipy>=0.16', 'six', 'paramz>=0.5.2'], extras_require = {'docs':['sphinx'], 'optional':['mpi4py', 'ipython>=4.0.0', From 78120ead83ddd069fe0a7cb71df43091d7b0293e Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:09:45 +0100 Subject: [PATCH 27/70] [setup] more setup changes --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 592a4347..1f9eee15 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,12 +56,11 @@ on_success: - "echo [pypi] > %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" - - "echo '' >> %USERPROFILE%\\.pypirc" + - "echo >> %USERPROFILE%\\.pypirc" - "echo [test] >> %USERPROFILE%\\.pypirc" - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" - - type %USERPROFILE%\\.pypirc - ls dist\ - twine upload -r test dist\* From 9713995b3191300270df1bcf5142bc9c0a2c8328 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:14:49 +0100 Subject: [PATCH 28/70] [setup] more setup changes --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1f9eee15..b0515456 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ install: - python -m pip install coverage - python -m pip install twine - "python setup.py develop" - - set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` + #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` build: off @@ -56,7 +56,7 @@ on_success: - "echo [pypi] > %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" - - "echo >> %USERPROFILE%\\.pypirc" + - echo "" >> "%USERPROFILE%\\.pypirc" - "echo [test] >> %USERPROFILE%\\.pypirc" - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" From bc41b4664d78482b7041c2f69908743316feb5f3 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:19:08 +0100 Subject: [PATCH 29/70] [appveyor] twine upload --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b0515456..5afb2b95 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,7 +56,7 @@ on_success: - "echo [pypi] > %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" - - echo "" >> "%USERPROFILE%\\.pypirc" + #- echo "" >> "%USERPROFILE%\\.pypirc" - "echo [test] >> %USERPROFILE%\\.pypirc" - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" From 99298815a8ef14063718b682071c1ed3b884a76d Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:27:10 +0100 Subject: [PATCH 30/70] [appveyor] pypirc --- appveyor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5afb2b95..c893e20c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,10 +53,13 @@ artifacts: - path: dist\* on_success: + - "echo [distutils] > %USERPROFILE%\\.pypirc" + - echo "index-servers =" >> %USERPROFILE%\\.pypirc + - echo " pypi" >> %USERPROFILE%\\.pypirc + - echo " test" >> %USERPROFILE%\\.pypirc - "echo [pypi] > %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" - #- echo "" >> "%USERPROFILE%\\.pypirc" - "echo [test] >> %USERPROFILE%\\.pypirc" - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - "echo username:maxz >> %USERPROFILE%\\.pypirc" From ab39798a22b5f4b1c9421bd0ef91ec24be4a40ae Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:32:24 +0100 Subject: [PATCH 31/70] [appveyor] pypirc --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c893e20c..0611e3fb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,13 +57,13 @@ on_success: - echo "index-servers =" >> %USERPROFILE%\\.pypirc - echo " pypi" >> %USERPROFILE%\\.pypirc - echo " test" >> %USERPROFILE%\\.pypirc - - "echo [pypi] > %USERPROFILE%\\.pypirc" - - "echo username:maxz >> %USERPROFILE%\\.pypirc" - - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" + - "echo [pypi] >> %USERPROFILE%\\.pypirc" + - echo "username:maxz" >> %USERPROFILE%\\.pypirc + - echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc - "echo [test] >> %USERPROFILE%\\.pypirc" - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - - "echo username:maxz >> %USERPROFILE%\\.pypirc" - - "echo password:%pip_upload% >> %USERPROFILE%\\.pypirc" + - echo "username:maxz" >> %USERPROFILE%\\.pypirc + - echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc - ls dist\ - twine upload -r test dist\* From 02e361ec8e6152bbee0a6f43950b36c40dfe7146 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:40:54 +0100 Subject: [PATCH 32/70] [appveyor] pypirc --- appveyor.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0611e3fb..2774ac34 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,15 +55,16 @@ artifacts: on_success: - "echo [distutils] > %USERPROFILE%\\.pypirc" - echo "index-servers =" >> %USERPROFILE%\\.pypirc - - echo " pypi" >> %USERPROFILE%\\.pypirc - - echo " test" >> %USERPROFILE%\\.pypirc + - echo pypi >> %USERPROFILE%\\.pypirc + - echo test >> %USERPROFILE%\\.pypirc - "echo [pypi] >> %USERPROFILE%\\.pypirc" - echo "username:maxz" >> %USERPROFILE%\\.pypirc - - echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc + #- echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc - "echo [test] >> %USERPROFILE%\\.pypirc" - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - echo "username:maxz" >> %USERPROFILE%\\.pypirc - - echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc + #- echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc + - type %USERPROFILE%\\.pypirc - ls dist\ - twine upload -r test dist\* From d489a622ed00225cb438aff7b5174ef6f3ec6ce1 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:47:08 +0100 Subject: [PATCH 33/70] [appveyor] pypirc --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2774ac34..ce2b03b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,16 +53,16 @@ artifacts: - path: dist\* on_success: - - "echo [distutils] > %USERPROFILE%\\.pypirc" - - echo "index-servers =" >> %USERPROFILE%\\.pypirc + - echo [distutils] > %USERPROFILE%\\.pypirc + - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc - echo test >> %USERPROFILE%\\.pypirc - - "echo [pypi] >> %USERPROFILE%\\.pypirc" - - echo "username:maxz" >> %USERPROFILE%\\.pypirc + - echo [pypi] >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc #- echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc - "echo [test] >> %USERPROFILE%\\.pypirc" - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - - echo "username:maxz" >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc #- echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc - type %USERPROFILE%\\.pypirc - ls dist\ From 2efbc7bd67abfd0ed1f77d085aba91a2aa0f6069 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 11:50:14 +0100 Subject: [PATCH 34/70] [appveyor] echo empty line --- appveyor.yml | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ce2b03b6..885cc372 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,21 +15,35 @@ branches: - deploy 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 twine - - "python setup.py develop" - #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` + - echo [distutils] > %USERPROFILE%\\.pypirc + - echo index-servers = >> %USERPROFILE%\\.pypirc + - echo pypi >> %USERPROFILE%\\.pypirc + - echo test >> %USERPROFILE%\\.pypirc + - echo[ + - echo [pypi] >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc + #- echo password:%pip_upload% >> %USERPROFILE%\\.pypirc + - echo[ + - "echo [test] >> %USERPROFILE%\\.pypirc" + - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" + - echo username:maxz >> %USERPROFILE%\\.pypirc + #- echo password:%pip_upload% >> %USERPROFILE%\\.pypirc + - type %USERPROFILE%\\.pypirc + - "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 twine + - "python setup.py develop" + #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` build: off From 5737df2ab93971b65633070611ca74d58072e939 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 12:03:56 +0100 Subject: [PATCH 35/70] [appveyor] twine --- appveyor.yml | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 885cc372..76d5f98a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: pip_upload: - secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= + secure:8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= matrix: - PYTHON_VERSION: 2.7 @@ -15,20 +15,6 @@ branches: - deploy install: - - echo [distutils] > %USERPROFILE%\\.pypirc - - echo index-servers = >> %USERPROFILE%\\.pypirc - - echo pypi >> %USERPROFILE%\\.pypirc - - echo test >> %USERPROFILE%\\.pypirc - - echo[ - - echo [pypi] >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - #- echo password:%pip_upload% >> %USERPROFILE%\\.pypirc - - echo[ - - "echo [test] >> %USERPROFILE%\\.pypirc" - - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" - - echo username:maxz >> %USERPROFILE%\\.pypirc - #- echo password:%pip_upload% >> %USERPROFILE%\\.pypirc - - type %USERPROFILE%\\.pypirc - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - conda config --set always_yes yes --set changeps1 no - conda update -q conda @@ -71,16 +57,17 @@ on_success: - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc - echo test >> %USERPROFILE%\\.pypirc + - echo[ - echo [pypi] >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - #- echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc - - "echo [test] >> %USERPROFILE%\\.pypirc" - - "echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc" + - echo password:%pip_upload% >> %USERPROFILE%\\.pypirc + - echo[ + - echo [test] >> %USERPROFILE%\\.pypirc + - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - #- echo "password:%pip_upload%" >> %USERPROFILE%\\.pypirc - - type %USERPROFILE%\\.pypirc + - echo password:%pip_upload% >> %USERPROFILE%\\.pypirc - ls dist\ - - twine upload -r test dist\* + - twine upload -r test dist/* #deploy: # release: GPy-v$(__version__) From d9679a1b03b26d37749192b389ccc6162d98eb34 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 12:16:12 +0100 Subject: [PATCH 36/70] [appveyor] secure password --- appveyor.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 76d5f98a..144ba183 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,8 @@ environment: pip_upload: - secure:8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= + secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= +environment: matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 @@ -28,7 +29,7 @@ install: - python -m pip install nose-show-skipped - python -m pip install coverage - python -m pip install twine - - "python setup.py develop" + #- "python setup.py develop" #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` build: off @@ -60,12 +61,12 @@ on_success: - echo[ - echo [pypi] >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - - echo password:%pip_upload% >> %USERPROFILE%\\.pypirc + - echo password:$env:pip_upload >> %USERPROFILE%\\.pypirc - echo[ - echo [test] >> %USERPROFILE%\\.pypirc - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - - echo password:%pip_upload% >> %USERPROFILE%\\.pypirc + - echo password:$env:pip_upload >> %USERPROFILE%\\.pypirc - ls dist\ - twine upload -r test dist/* From 23b3b7b159863ee4b0dee18950054f87fe658016 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 12:22:05 +0100 Subject: [PATCH 37/70] [appveyor] secure password 2 --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 144ba183..d5a666ec 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,6 @@ environment: pip_upload: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= - -environment: matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 From 463907ca500e010917fbccf78a8e44c175f5be7e Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 12:27:53 +0100 Subject: [PATCH 38/70] [appveyor] secure password 2 --- appveyor.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d5a666ec..f4655fa4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ environment: - pip_upload: + pip_access: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= matrix: - PYTHON_VERSION: 2.7 @@ -52,21 +52,7 @@ artifacts: - path: dist\* on_success: - - echo [distutils] > %USERPROFILE%\\.pypirc - - echo index-servers = >> %USERPROFILE%\\.pypirc - - echo pypi >> %USERPROFILE%\\.pypirc - - echo test >> %USERPROFILE%\\.pypirc - - echo[ - - echo [pypi] >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - - echo password:$env:pip_upload >> %USERPROFILE%\\.pypirc - - echo[ - - echo [test] >> %USERPROFILE%\\.pypirc - - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - - echo password:$env:pip_upload >> %USERPROFILE%\\.pypirc - - ls dist\ - - twine upload -r test dist/* + - twine upload -r https://testpypi.python.org/pypi -u maxz -p %pip_access% dist/* #deploy: # release: GPy-v$(__version__) From 5dd7f26e4380a95df6433430337491d2f7111502 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 12:50:14 +0100 Subject: [PATCH 39/70] [appveyor] secure password 3 --- appveyor.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f4655fa4..78d284bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ environment: - pip_access: + pip_upload: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= matrix: - PYTHON_VERSION: 2.7 @@ -52,7 +52,19 @@ artifacts: - path: dist\* on_success: - - twine upload -r https://testpypi.python.org/pypi -u maxz -p %pip_access% dist/* + - echo [distutils] > %USERPROFILE%\\.pypirc + - echo index-servers = >> %USERPROFILE%\\.pypirc + - echo pypi >> %USERPROFILE%\\.pypirc + - echo test >> %USERPROFILE%\\.pypirc + - echo[ + - echo [pypi] >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc + - echo[ + - echo [test] >> %USERPROFILE%\\.pypirc + - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc + - ls dist\ + - twine upload -r test -p %pip_upload% dist/* #deploy: # release: GPy-v$(__version__) From 3443b35840021c95341c2be0b7b93a11762b743e Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 12:51:11 +0100 Subject: [PATCH 40/70] [appveyor] secure password 3 --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 78d284bf..ef96d477 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,8 @@ environment: MINICONDA: C:\Miniconda-x64 - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 - + my_variable: + secure: qMBS2BuAsH+SrwUduBLs4Q== branches: @@ -52,6 +53,7 @@ artifacts: - path: dist\* on_success: + - echo %my_variable% - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc From 495d4c3750c308599e6d578fd591364a6a514241 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 12:59:18 +0100 Subject: [PATCH 41/70] [secure] does it actually work? --- appveyor.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ef96d477..e1ad2d1a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,21 +15,23 @@ branches: - deploy 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 twine - #- "python setup.py develop" - #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` + - echo %my_variable% + - echo %USERPROFILE% + - "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 twine + #- "python setup.py develop" + #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` build: off @@ -53,7 +55,6 @@ artifacts: - path: dist\* on_success: - - echo %my_variable% - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc From c37624d343979539f3e89f834bf070ebfdca85f3 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:01:17 +0100 Subject: [PATCH 42/70] [secure] does it actually work? --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e1ad2d1a..a0915f5f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,12 @@ environment: - pip_upload: + PIP_ACCESS: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 - my_variable: + ASDF: secure: qMBS2BuAsH+SrwUduBLs4Q== @@ -15,7 +15,7 @@ branches: - deploy install: - - echo %my_variable% + - echo %ASDF% - echo %USERPROFILE% - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - conda config --set always_yes yes --set changeps1 no From a1612df686c5b4045d5be2f4b57a640a5e8cf128 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:10:08 +0100 Subject: [PATCH 43/70] [secure] does it actually work? --- appveyor.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a0915f5f..eed16581 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,10 @@ environment: branches: only: - - deploy - + - devel + except: + - gh-pages + install: - echo %ASDF% - echo %USERPROFILE% @@ -30,7 +32,7 @@ install: - python -m pip install nose-show-skipped - python -m pip install coverage - python -m pip install twine - #- "python setup.py develop" + - "python setup.py develop" #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` build: off @@ -44,7 +46,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. @@ -54,7 +56,7 @@ artifacts: # bdist_wheel puts your built wheel in the dist directory - path: dist\* -on_success: +deploy_script: - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc From dd8a0280f50126e754cd89e15324dd9ee114b62a Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:20:04 +0100 Subject: [PATCH 44/70] [secure] does it actually work? --- appveyor.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index eed16581..73e2fe46 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,14 +1,11 @@ environment: - PIP_ACCESS: + pip_access: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 - ASDF: - secure: qMBS2BuAsH+SrwUduBLs4Q== - branches: only: @@ -17,8 +14,6 @@ branches: - gh-pages install: - - echo %ASDF% - - echo %USERPROFILE% - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - conda config --set always_yes yes --set changeps1 no - conda update -q conda @@ -33,7 +28,7 @@ install: - python -m pip install coverage - python -m pip install twine - "python setup.py develop" - #- set `copy /b GPy/__version__.py | tr -d '[[:space:]]'` + - set `copy /b GPy/__version__.py` build: off @@ -69,13 +64,13 @@ deploy_script: - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - ls dist\ - - twine upload -r test -p %pip_upload% dist/* + - twine upload -r test -p %pip_access% dist/* -#deploy: +deploy: # release: GPy-v$(__version__) # description: 'GPy windows install' # provider: GitHub -# artifact: dist\*.exe # upload wininst to GitHub +# artifact: dist/*.exe # upload wininst to GitHub # draft: false # prerelease: false # on: From 78ab5e60a71b60f0222529b874445b1cfb9c98b4 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:20:27 +0100 Subject: [PATCH 45/70] [secure] yes but not on prs --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 73e2fe46..73f28954 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -66,7 +66,7 @@ deploy_script: - ls dist\ - twine upload -r test -p %pip_access% dist/* -deploy: +#deploy: # release: GPy-v$(__version__) # description: 'GPy windows install' # provider: GitHub From a497bb418fd782730e2c57b8dfd12f3c543aead0 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:23:47 +0100 Subject: [PATCH 46/70] [version] for github releases? --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 73f28954..f2ba081f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,8 @@ branches: - gh-pages install: + - (set /p Date: Fri, 29 Jul 2016 13:39:02 +0100 Subject: [PATCH 47/70] [deploy] branch check --- appveyor.yml | 36 ++++++++++++++++++++---------------- setup.cfg | 1 + 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f2ba081f..cadbfe28 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,9 @@ environment: pip_access: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= + gpy_version: 1.1.0 matrix: + fast_finish: true - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 - PYTHON_VERSION: 3.5 @@ -9,13 +11,13 @@ environment: branches: only: + - deploy - devel except: - gh-pages install: - - (set /p %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc @@ -64,16 +68,16 @@ deploy_script: - echo [test] >> %USERPROFILE%\\.pypirc - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - - ls dist\ - - twine upload -r test -p %pip_access% dist/* + #- twine upload -r test -p %pip_access% dist/* + - twine upload -p %pip_access% dist/* -#deploy: -# release: GPy-v$(__version__) -# description: 'GPy windows install' -# provider: GitHub -# artifact: dist/*.exe # upload wininst to GitHub -# draft: false -# 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 +deploy: + - provider: GitHub + release: GPy-v$(gpy_version) + description: 'GPy windows install' + artifact: dist/*.exe # upload wininst to GitHub + draft: false + 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 diff --git a/setup.cfg b/setup.cfg index 4c59444e..7ee8fbe7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,6 +4,7 @@ tag = False commit = True [bumpversion:file:GPy/__version__.py] +[bumpversion:file:appveyor.yml] [upload_docs] upload-dir = doc/build/html From 772db9ed79efb6c8dff0858732a16a2142f16cae Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:39:58 +0100 Subject: [PATCH 48/70] [deploy] branch check --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cadbfe28..ef27dc55 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,6 @@ environment: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= gpy_version: 1.1.0 matrix: - fast_finish: true - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 - PYTHON_VERSION: 3.5 @@ -56,7 +55,7 @@ artifacts: - path: dist\* deploy_script: - + on - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc From 270e247b732caf974e5c2b965a028dda617379c1 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:42:25 +0100 Subject: [PATCH 49/70] [deploy] branch check --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ef27dc55..b41ead18 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,7 +55,8 @@ artifacts: - path: dist\* deploy_script: - on + on: + branch: deploy # release from deploy branch only - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc From d6cb2a704b9e6abe6bf997ab4e4be53bced9e0e7 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:43:37 +0100 Subject: [PATCH 50/70] [deploy] branch check --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b41ead18..2dd5710b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,8 +55,6 @@ artifacts: - path: dist\* deploy_script: - on: - branch: deploy # release from deploy branch only - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc @@ -80,4 +78,4 @@ deploy: 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 \ No newline at end of file From 969fca1c3dc522854264ebc1789fc80a67b04478 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 13:57:48 +0100 Subject: [PATCH 51/70] [deploy] branch check --- appveyor.yml | 79 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2dd5710b..f0827863 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,15 +8,8 @@ environment: - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 -branches: - only: - - deploy - - devel - except: - - gh-pages install: - - echo %branch% - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - conda config --set always_yes yes --set changeps1 no - conda update -q conda @@ -54,28 +47,52 @@ artifacts: # bdist_wheel puts your built wheel in the dist directory - path: dist\* -deploy_script: - - echo [distutils] > %USERPROFILE%\\.pypirc - - echo index-servers = >> %USERPROFILE%\\.pypirc - - echo pypi >> %USERPROFILE%\\.pypirc - - echo test >> %USERPROFILE%\\.pypirc - - echo[ - - echo [pypi] >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - - echo[ - - echo [test] >> %USERPROFILE%\\.pypirc - - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - #- twine upload -r test -p %pip_access% dist/* - - twine upload -p %pip_access% dist/* + +- + branches: + only: + - devel + configuration: Test + deploy_script: + - echo [distutils] > %USERPROFILE%\\.pypirc + - echo index-servers = >> %USERPROFILE%\\.pypirc + - echo pypi >> %USERPROFILE%\\.pypirc + - echo test >> %USERPROFILE%\\.pypirc + - echo[ + - echo [pypi] >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc + - echo[ + - echo [test] >> %USERPROFILE%\\.pypirc + - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc + - twine upload -r test -p %pip_access% dist/* + -deploy: - - provider: GitHub - release: GPy-v$(gpy_version) - description: 'GPy windows install' - artifact: dist/*.exe # upload wininst to GitHub - draft: false - 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 +- + branches: + only: + - deploy + configuration: Release + deploy: + - provider: GitHub + release: GPy-v$(gpy_version) + description: 'GPy windows install' + artifact: dist/*.exe # upload wininst to GitHub + draft: false + prerelease: false + on: + branch: deploy # release from deploy branch only + appveyor_repo_tag: true # deploy on tag push only + deploy_script: + - echo [distutils] > %USERPROFILE%\\.pypirc + - echo index-servers = >> %USERPROFILE%\\.pypirc + - echo pypi >> %USERPROFILE%\\.pypirc + - echo test >> %USERPROFILE%\\.pypirc + - echo[ + - echo [pypi] >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc + - echo[ + - echo [test] >> %USERPROFILE%\\.pypirc + - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc + - echo username:maxz >> %USERPROFILE%\\.pypirc + - twine upload -p %pip_access% dist/* From 2fb3a3a862ec0ed8f76adbc75c6a0fdb93e2c82d Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 14:03:33 +0100 Subject: [PATCH 52/70] [deploy] branch check --- appveyor.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f0827863..698111c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,10 @@ environment: - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 - +configuration: + - Debug + - Release + install: - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" - conda config --set always_yes yes --set changeps1 no @@ -52,7 +55,7 @@ artifacts: branches: only: - devel - configuration: Test + configuration: Debug deploy_script: - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc @@ -68,7 +71,7 @@ artifacts: - twine upload -r test -p %pip_access% dist/* -- +- branches: only: - deploy From 4ad78bb1212a6c7c3490850813206617ab867e13 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 14:05:33 +0100 Subject: [PATCH 53/70] [deploy] branch check --- appveyor.yml | 71 +++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 698111c9..0d6f67bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,9 +8,9 @@ environment: - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 -configuration: - - Debug - - Release +#configuration: +# - Debug +# - Release install: - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%" @@ -51,12 +51,9 @@ artifacts: - path: dist\* -- - branches: - only: - - devel - configuration: Debug - deploy_script: +deploy_script: + on: + branch: devel - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc @@ -71,31 +68,31 @@ artifacts: - twine upload -r test -p %pip_access% dist/* -- - branches: - only: - - deploy - configuration: Release - deploy: - - provider: GitHub - release: GPy-v$(gpy_version) - description: 'GPy windows install' - artifact: dist/*.exe # upload wininst to GitHub - draft: false - prerelease: false - on: - branch: deploy # release from deploy branch only - appveyor_repo_tag: true # deploy on tag push only - deploy_script: - - echo [distutils] > %USERPROFILE%\\.pypirc - - echo index-servers = >> %USERPROFILE%\\.pypirc - - echo pypi >> %USERPROFILE%\\.pypirc - - echo test >> %USERPROFILE%\\.pypirc - - echo[ - - echo [pypi] >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - - echo[ - - echo [test] >> %USERPROFILE%\\.pypirc - - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - - twine upload -p %pip_access% dist/* +# - +# branches: +# only: +# - deploy +# configuration: Release +# deploy: +# - provider: GitHub +# release: GPy-v$(gpy_version) +# description: 'GPy windows install' +# artifact: dist/*.exe # upload wininst to GitHub +# draft: false +# prerelease: false +# on: +# branch: deploy # release from deploy branch only +# appveyor_repo_tag: true # deploy on tag push only +# deploy_script: +# - echo [distutils] > %USERPROFILE%\\.pypirc +# - echo index-servers = >> %USERPROFILE%\\.pypirc +# - echo pypi >> %USERPROFILE%\\.pypirc +# - echo test >> %USERPROFILE%\\.pypirc +# - echo[ +# - echo [pypi] >> %USERPROFILE%\\.pypirc +# - echo username:maxz >> %USERPROFILE%\\.pypirc +# - echo[ +# - echo [test] >> %USERPROFILE%\\.pypirc +# - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc +# - echo username:maxz >> %USERPROFILE%\\.pypirc +# - twine upload -p %pip_access% dist/* From 3a2361a8b233a453ac1a5385e15013dba25af647 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 14:06:57 +0100 Subject: [PATCH 54/70] [deploy] branch check --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0d6f67bb..0af5bc74 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,8 +52,6 @@ artifacts: deploy_script: - on: - branch: devel - echo [distutils] > %USERPROFILE%\\.pypirc - echo index-servers = >> %USERPROFILE%\\.pypirc - echo pypi >> %USERPROFILE%\\.pypirc @@ -66,7 +64,8 @@ deploy_script: - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - twine upload -r test -p %pip_access% dist/* - + on: + branch: devel # - # branches: From cff32d8c0b7e11c8c2f26e7964bad69cc3fe11bd Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 14:07:26 +0100 Subject: [PATCH 55/70] [deploy] branch check --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0af5bc74..fe6753fa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,7 +64,7 @@ deploy_script: - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - twine upload -r test -p %pip_access% dist/* - on: + - on: branch: devel # - From fd79868a82eb5adaebfd02d5ccb2cf697078c6ad Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Fri, 29 Jul 2016 14:17:13 +0100 Subject: [PATCH 56/70] [deploy] branch check --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index fe6753fa..21d5a1f1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,6 +25,7 @@ install: - python -m pip install paramz - python -m pip install nose-show-skipped - python -m pip install coverage + - python -m pip install codecov - python -m pip install twine - "python setup.py develop" From 24cbbde647bed48422961ec5e65cfe8c4605d187 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 09:00:28 +0100 Subject: [PATCH 57/70] [appveyor] test deploy and full deploy --- appveyor.yml | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 21d5a1f1..96e51cd0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,35 +64,21 @@ deploy_script: - echo [test] >> %USERPROFILE%\\.pypirc - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - - twine upload -r test -p %pip_access% dist/* - - on: - branch: devel + - ps: | + switch ($env:APPVEYOR_REPO_BRANCH) + { + devel {twine upload -r test -p %pip_access% dist/*} + deploy {twine upload -p %pip_access% dist/*} + default {echo not deploying on other branches} + } -# - -# branches: -# only: -# - deploy -# configuration: Release -# deploy: -# - provider: GitHub -# release: GPy-v$(gpy_version) -# description: 'GPy windows install' -# artifact: dist/*.exe # upload wininst to GitHub -# draft: false -# prerelease: false -# on: -# branch: deploy # release from deploy branch only -# appveyor_repo_tag: true # deploy on tag push only -# deploy_script: -# - echo [distutils] > %USERPROFILE%\\.pypirc -# - echo index-servers = >> %USERPROFILE%\\.pypirc -# - echo pypi >> %USERPROFILE%\\.pypirc -# - echo test >> %USERPROFILE%\\.pypirc -# - echo[ -# - echo [pypi] >> %USERPROFILE%\\.pypirc -# - echo username:maxz >> %USERPROFILE%\\.pypirc -# - echo[ -# - echo [test] >> %USERPROFILE%\\.pypirc -# - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc -# - echo username:maxz >> %USERPROFILE%\\.pypirc -# - twine upload -p %pip_access% dist/* +deploy: + - provider: GitHub + release: GPy-v$(gpy_version) + description: 'GPy windows install' + artifact: dist/*.exe # upload wininst to GitHub + draft: false + 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 From 179ff360b20d2873376fc4d45363513b7a76904b Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 09:02:46 +0100 Subject: [PATCH 58/70] =?UTF-8?q?Bump=20version:=201.1.0=20=E2=86=92=201.1?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GPy/__version__.py | 2 +- appveyor.yml | 2 +- setup.cfg | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GPy/__version__.py b/GPy/__version__.py index 6849410a..a82b376d 100644 --- a/GPy/__version__.py +++ b/GPy/__version__.py @@ -1 +1 @@ -__version__ = "1.1.0" +__version__ = "1.1.1" diff --git a/appveyor.yml b/appveyor.yml index 96e51cd0..ede4c5c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: pip_access: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= - gpy_version: 1.1.0 + gpy_version: 1.1.1 matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 diff --git a/setup.cfg b/setup.cfg index 7ee8fbe7..dd4febfb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,10 @@ [bumpversion] -current_version = 1.1.0 +current_version = 1.1.1 tag = False commit = True [bumpversion:file:GPy/__version__.py] + [bumpversion:file:appveyor.yml] [upload_docs] From 97cf1c75814e89179e014ee024bffcabf76fd4e4 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 09:04:29 +0100 Subject: [PATCH 59/70] [appveyor] stop deploy on github --- appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ede4c5c9..c5b0ee1b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,13 +72,13 @@ deploy_script: default {echo not deploying on other branches} } -deploy: - - provider: GitHub - release: GPy-v$(gpy_version) - description: 'GPy windows install' - artifact: dist/*.exe # upload wininst to GitHub - draft: false - 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 +# deploy: +# - provider: GitHub +# release: GPy-v$(gpy_version) +# description: 'GPy windows install' +# artifact: dist/*.exe # upload wininst to GitHub +# draft: false +# 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 From 8f09aa2f872ad7978ac454a35b62365e6b828212 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 09:16:41 +0100 Subject: [PATCH 60/70] [appveyor] stop deploy on github --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c5b0ee1b..9460aeaa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,7 +64,7 @@ deploy_script: - echo [test] >> %USERPROFILE%\\.pypirc - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc - - ps: | + - ps: >- switch ($env:APPVEYOR_REPO_BRANCH) { devel {twine upload -r test -p %pip_access% dist/*} From 1fd53722055241dd5edbe01db86d782e5a2ac829 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 09:21:36 +0100 Subject: [PATCH 61/70] [appveyor] elsif ps --- appveyor.yml | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9460aeaa..8a95b033 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,23 +53,26 @@ artifacts: deploy_script: - - echo [distutils] > %USERPROFILE%\\.pypirc - - echo index-servers = >> %USERPROFILE%\\.pypirc - - echo pypi >> %USERPROFILE%\\.pypirc - - echo test >> %USERPROFILE%\\.pypirc - - echo[ - - echo [pypi] >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - - echo[ - - echo [test] >> %USERPROFILE%\\.pypirc - - echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc - - echo username:maxz >> %USERPROFILE%\\.pypirc - - ps: >- - switch ($env:APPVEYOR_REPO_BRANCH) - { - devel {twine upload -r test -p %pip_access% dist/*} - deploy {twine upload -p %pip_access% dist/*} - default {echo not deploying on other branches} +- echo [distutils] > %USERPROFILE%\\.pypirc +- echo index-servers = >> %USERPROFILE%\\.pypirc +- echo pypi >> %USERPROFILE%\\.pypirc +- echo test >> %USERPROFILE%\\.pypirc +- echo[ +- echo [pypi] >> %USERPROFILE%\\.pypirc +- echo username:maxz >> %USERPROFILE%\\.pypirc +- echo[ +- echo [test] >> %USERPROFILE%\\.pypirc +- echo repository:https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc +- echo username:maxz >> %USERPROFILE%\\.pypirc +- ps: >- + if ($env:APPVEYOR_REPO_BRANCH -eq 'devel') { + twine upload -r test -p %pip_access% dist/* + } + elseif ($env:APPVEYOR_REPO_BRANCH -eq 'deploy') { + twine upload -p %pip_access% dist/* + } + else { + echo not deploying on other branches } # deploy: From d710b6f9db95d215028532138cf5ff2b28893c92 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 09:31:36 +0100 Subject: [PATCH 62/70] [appveyor] elsif ps --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8a95b033..ef3559aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -60,16 +60,18 @@ deploy_script: - echo[ - echo [pypi] >> %USERPROFILE%\\.pypirc - echo username:maxz >> %USERPROFILE%\\.pypirc +- echo password:%pip_access% >> %USERPROFILE%\\.pypirc - echo[ - echo [test] >> %USERPROFILE%\\.pypirc - 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') { - twine upload -r test -p %pip_access% dist/* + twine upload -r test dist/* } elseif ($env:APPVEYOR_REPO_BRANCH -eq 'deploy') { - twine upload -p %pip_access% dist/* + twine upload dist/* } else { echo not deploying on other branches From bb1a1eba5007c4810dd74b89c168ab5c0b153861 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 09:32:52 +0100 Subject: [PATCH 63/70] [appveyor] twine? --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ef3559aa..f581cd51 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,12 +40,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 + #- codecov artifacts: # bdist_wheel puts your built wheel in the dist directory From b2975222763cad710a06ef8fb6a9fbd896929c50 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 10:35:23 +0100 Subject: [PATCH 64/70] [codecov] default branch --- appveyor.yml | 4 ++-- codecov.yml | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 codecov.yml diff --git a/appveyor.yml b/appveyor.yml index f581cd51..ef3559aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,12 +40,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 + - codecov artifacts: # bdist_wheel puts your built wheel in the dist directory diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 00000000..49597c7b --- /dev/null +++ b/codecov.yml @@ -0,0 +1,22 @@ +coverage: + branch: devel + precision: 2 + round: down + range: "40...100" + + status: + project: + default: + target: auto + if_no_uploads: error + + patch: + default: + if_no_uploads: error + + changes: true + + +comment: + layout: "header, diff, changes, suggestions" + behavior: default \ No newline at end of file From 85baef7cb086027d1cb43c5f4cd0fc2d88f08b3b Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 10:41:15 +0100 Subject: [PATCH 65/70] =?UTF-8?q?Bump=20version:=201.1.1=20=E2=86=92=201.1?= =?UTF-8?q?.2?= 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 a82b376d..72f26f59 100644 --- a/GPy/__version__.py +++ b/GPy/__version__.py @@ -1 +1 @@ -__version__ = "1.1.1" +__version__ = "1.1.2" diff --git a/appveyor.yml b/appveyor.yml index ef3559aa..6afad5ab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: pip_access: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= - gpy_version: 1.1.1 + gpy_version: 1.1.2 matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 diff --git a/setup.cfg b/setup.cfg index dd4febfb..63845233 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.1 +current_version = 1.1.2 tag = False commit = True From b47792d7ebe7638215f4ece48ebf9efd480cd9f8 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 10:48:49 +0100 Subject: [PATCH 66/70] [coverage] default to devel --- codecov.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index 49597c7b..a8a1ba08 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,5 +1,7 @@ +codecov: + branch: devel + coverage: - branch: devel precision: 2 round: down range: "40...100" From 5ca5c0cd2e9002e11aca9c35079b5cfa82e238b1 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 10:48:55 +0100 Subject: [PATCH 67/70] =?UTF-8?q?Bump=20version:=201.1.2=20=E2=86=92=201.1?= =?UTF-8?q?.3?= 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 72f26f59..0b2f79db 100644 --- a/GPy/__version__.py +++ b/GPy/__version__.py @@ -1 +1 @@ -__version__ = "1.1.2" +__version__ = "1.1.3" diff --git a/appveyor.yml b/appveyor.yml index 6afad5ab..d800a886 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: pip_access: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= - gpy_version: 1.1.2 + gpy_version: 1.1.3 matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 diff --git a/setup.cfg b/setup.cfg index 63845233..093dae49 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.2 +current_version = 1.1.3 tag = False commit = True From 6d92fb6cbc787e7cf1235823be5b9fbd7253f266 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 11:27:14 +0100 Subject: [PATCH 68/70] [travis] not tagged --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7a35d6b8..9a738047 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,6 @@ deploy: password: secure: "vMEOlP7DQhFJ7hQAKtKC5hrJXFl5BkUt4nXdosWWiw//Kg8E+PPLg88XPI2gqIosir9wwgtbSBBbbwCxkM6uxRNMpoNR8Ixyv9fmSXp4rLl7bbBY768W7IRXKIBjpuEy2brQjoT+CwDDSzUkckHvuUjJDNRvUv8ab4P/qYO1LG4=" on: - tags: true branch: deploy distributions: $DIST skip_cleanup: true From 695d2cdd44406924b76129213c7b5eec54c47451 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Sat, 30 Jul 2016 11:27:23 +0100 Subject: [PATCH 69/70] =?UTF-8?q?Bump=20version:=201.1.3=20=E2=86=92=201.2?= =?UTF-8?q?.0?= 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 0b2f79db..c68196d1 100644 --- a/GPy/__version__.py +++ b/GPy/__version__.py @@ -1 +1 @@ -__version__ = "1.1.3" +__version__ = "1.2.0" diff --git a/appveyor.yml b/appveyor.yml index d800a886..50e3d3fc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: pip_access: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= - gpy_version: 1.1.3 + gpy_version: 1.2.0 matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 diff --git a/setup.cfg b/setup.cfg index 093dae49..d2f03e2c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.3 +current_version = 1.2.0 tag = False commit = True From 02457660a2128c295acf50cc06035e34177e7b74 Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Sat, 30 Jul 2016 11:31:03 +0100 Subject: [PATCH 70/70] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b556bfd..4df7bbe1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Gaussian processes framework in Python. * Travis-CI [unit-tests](https://travis-ci.org/SheffieldML/GPy) * [![licence](https://img.shields.io/badge/licence-BSD-blue.svg)](http://opensource.org/licenses/BSD-3-Clause) -[![develstat](https://travis-ci.org/SheffieldML/GPy.svg?branch=devel)](https://travis-ci.org/SheffieldML/GPy) [![covdevel](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=devel)](http://codecov.io/github/SheffieldML/GPy?branch=devel) [![Research software impact](http://depsy.org/api/package/pypi/GPy/badge.svg)](http://depsy.org/package/python/GPy) [![Code Health](https://landscape.io/github/SheffieldML/GPy/devel/landscape.svg?style=flat)](https://landscape.io/github/SheffieldML/GPy/devel) +[![develstat](https://travis-ci.org/SheffieldML/GPy.svg?branch=devel)](https://travis-ci.org/SheffieldML/GPy) [![appveyor](https://ci.appveyor.com/api/projects/status/662o6tha09m2jix3/branch/deploy?svg=true)](https://ci.appveyor.com/project/mzwiessele/gpy/branch/deploy) [![covdevel](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=devel)](http://codecov.io/github/SheffieldML/GPy?branch=devel) [![Research software impact](http://depsy.org/api/package/pypi/GPy/badge.svg)](http://depsy.org/package/python/GPy) [![Code Health](https://landscape.io/github/SheffieldML/GPy/devel/landscape.svg?style=flat)](https://landscape.io/github/SheffieldML/GPy/devel) ## Updated Structure