Merge branch 'devel' of github.com:SheffieldML/GPy into devel

This commit is contained in:
Max Zwiessele 2015-11-13 07:59:49 +00:00
commit fdd1bc3a89
6 changed files with 20 additions and 15 deletions

View file

@ -1,8 +1,8 @@
# .coveragerc to control coverage.py # .coveragerc to control coverage.py
[run] [run]
branch = True branch = True
source = paramz source = GPy
omit = ./paramz/tests/*.py, travis_tests.py, setup.py, ./paramz/__version__.py omit = ./GPy/testing/*.py, travis_tests.py, setup.py, ./GPy/__version__.py
[report] [report]
# Regexes for lines to exclude from consideration # Regexes for lines to exclude from consideration

View file

@ -60,6 +60,11 @@ before_deploy:
- sphinx-apidoc -o source/ ../GPy - sphinx-apidoc -o source/ ../GPy
- make html - make html
- cd ../ - cd ../
- if [[ "$TRAVIS_OS_NAME" == "linux" ]];
then export DIST='register sdist';
elif [[ "$TRAVIS_OS_NAME" == "osx" ]];
then export DIST='bdist_wheel';
fi;
deploy: deploy:
provider: pypi provider: pypi
@ -68,7 +73,7 @@ deploy:
secure: "vMEOlP7DQhFJ7hQAKtKC5hrJXFl5BkUt4nXdosWWiw//Kg8E+PPLg88XPI2gqIosir9wwgtbSBBbbwCxkM6uxRNMpoNR8Ixyv9fmSXp4rLl7bbBY768W7IRXKIBjpuEy2brQjoT+CwDDSzUkckHvuUjJDNRvUv8ab4P/qYO1LG4=" secure: "vMEOlP7DQhFJ7hQAKtKC5hrJXFl5BkUt4nXdosWWiw//Kg8E+PPLg88XPI2gqIosir9wwgtbSBBbbwCxkM6uxRNMpoNR8Ixyv9fmSXp4rLl7bbBY768W7IRXKIBjpuEy2brQjoT+CwDDSzUkckHvuUjJDNRvUv8ab4P/qYO1LG4="
on: on:
tags: false tags: false
branch: paramz branch: devel
server: https://testpypi.python.org/pypi server: https://testpypi.python.org/pypi
distributions: "bdist_wheel sdist" distributions: $DIST
skip_cleanup: true skip_cleanup: true

View file

@ -1 +1 @@
__version__ = "0.8.21" __version__ = "0.8.30"

View file

@ -2,11 +2,11 @@
The Gaussian processes framework in Python. The Gaussian processes framework in Python.
* [GPy homepage](http://sheffieldml.github.io/GPy/) * GPy [homepage](http://sheffieldml.github.io/GPy/)
* [Tutorial notebooks](http://nbviewer.ipython.org/github/SheffieldML/notebook/blob/master/GPy/index.ipynb) * Tutorial [notebooks](http://nbviewer.ipython.org/github/SheffieldML/notebook/blob/master/GPy/index.ipynb)
* [User mailing list](https://lists.shef.ac.uk/sympa/subscribe/gpy-users) * User [mailing-list](https://lists.shef.ac.uk/sympa/subscribe/gpy-users)
* [Developer documentation](http://gpy.readthedocs.org/en/devel/) * Developer [documentation](http://gpy.readthedocs.org/en/devel/)
* [Unit tests (Travis-CI)](https://travis-ci.org/SheffieldML/GPy) * 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) * [![licence](https://img.shields.io/badge/licence-BSD-blue.svg)](http://opensource.org/licenses/BSD-3-Clause)
## Updated Structure ## Updated Structure
@ -27,8 +27,8 @@ again, in the GPy installation folder.
| | Travis-CI | Codecov | RTFD | | | Travis-CI | Codecov | RTFD |
| ---: | :--: | :---: | :---: | | ---: | :--: | :---: | :---: |
| **master:** | [![master](https://travis-ci.org/SheffieldML/GPy.svg?branch=master)](https://travis-ci.org/SheffieldML/GPy) | [![codecovmaster](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=master)](http://codecov.io/github/SheffieldML/GPy?branch=master) | [![docmaster](https://readthedocs.org/projects/gpy/badge/?version=master)](http://gpy.readthedocs.org/en/master/) | | **master:** | [![masterstat](https://travis-ci.org/SheffieldML/GPy.svg?branch=master)](https://travis-ci.org/SheffieldML/GPy) | [![covmaster](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=master)](http://codecov.io/github/SheffieldML/GPy?branch=master) | [![docmaster](https://readthedocs.org/projects/gpy/badge/?version=master)](http://gpy.readthedocs.org/en/master/) |
| **devel:** | [![devel](https://travis-ci.org/SheffieldML/GPy.svg?branch=devel)](https://travis-ci.org/SheffieldML/GPy) | [![codecovdevel](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=devel)](http://codecov.io/github/SheffieldML/GPy?branch=devel) | [![docdevel](https://readthedocs.org/projects/gpy/badge/?version=devel)](http://gpy.readthedocs.org/en/devel/) | | **devel:** | [![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) | [![docdevel](https://readthedocs.org/projects/gpy/badge/?version=devel)](http://gpy.readthedocs.org/en/devel/) |
## Supported Platforms: ## Supported Platforms:

View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.8.21 current_version = 0.8.30
tag = True tag = True
commit = True commit = True

View file

@ -57,7 +57,7 @@ def read_to_rst(fname):
except ImportError: except ImportError:
return read(fname) return read(fname)
read_to_rst('README.md') desc = read_to_rst('README.md')
version_dummy = {} version_dummy = {}
exec(read('GPy/__version__.py'), version_dummy) exec(read('GPy/__version__.py'), version_dummy)
@ -139,7 +139,7 @@ setup(name = 'GPy',
include_package_data = True, include_package_data = True,
py_modules = ['GPy.__init__'], py_modules = ['GPy.__init__'],
test_suite = 'GPy.testing', test_suite = 'GPy.testing',
long_description='https://github.com/SheffieldML/GPy', long_description=desc,
install_requires=['numpy>=1.7', 'scipy>=0.16', 'six', 'paramz'], install_requires=['numpy>=1.7', 'scipy>=0.16', 'six', 'paramz'],
extras_require = {'docs':['sphinx'], extras_require = {'docs':['sphinx'],
'optional':['mpi4py', 'optional':['mpi4py',