Skip to content

Commit

Permalink
Merge pull request #367 from SheffieldML/devel
Browse files Browse the repository at this point in the history
Update setup to fix problems with slicing
  • Loading branch information
mzwiessele committed Apr 11, 2016
2 parents 22b6f11 + 718803a commit 42bfd99
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
7 changes: 3 additions & 4 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ omit = ./GPy/testing/*.py, travis_tests.py, setup.py, ./GPy/__version__.py
exclude_lines =
# Have to re-enable the standard pragma
pragma: no cover

verbose

# Don't complain about missing debug-only code:
if self\.debug

# Don't complain if tests don't hit defensive assertion code:
raise AssertionError
raise NotImplementedError
raise NotImplemented
raise
except
pass
Not implemented

# Don't complain if non-runnable code isn't run:
if 0:
Expand Down
2 changes: 1 addition & 1 deletion GPy/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.5"
__version__ = "1.0.6"
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.0.5
current_version = 1.0.6
tag = False
commit = True

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def ismac():
py_modules = ['GPy.__init__'],
test_suite = 'GPy.testing',
long_description=desc,
install_requires=['numpy>=1.7', 'scipy>=0.16', 'six', 'paramz'],
install_requires=['numpy>=1.7', 'scipy>=0.16', 'six', 'paramz>=0.5.2'],
extras_require = {'docs':['sphinx'],
'optional':['mpi4py',
'ipython>=4.0.0',
Expand Down Expand Up @@ -198,4 +198,4 @@ def ismac():
else:
print("GPy: User configuration file at location {}".format(user_file))
except:
print("GPy: Could not write user configuration file {}".format(user_file))
print("GPy: Could not write user configuration file {}".format(user_file))

0 comments on commit 42bfd99

Please sign in to comment.