Skip to content

Commit 1ed21d3

Browse files
author
Rémy HUBSCHER
committed
Merge branch 'prepare-5.0.0'
2 parents 6a9ce92 + 471e1de commit 1ed21d3

File tree

6 files changed

+38
-12
lines changed

6 files changed

+38
-12
lines changed

CHANGELOG.rst

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,24 @@ CHANGELOG
44
This document describes changes between each past release.
55

66

7-
5.0.0 (unreleased)
7+
5.0.0 (2016-05-12)
88
==================
99

1010
**Breaking changes**
1111

12-
- Rename the last_modified client parameter into if_match (#68)
12+
- Rename the ``last_modified`` client parameter into ``if_match`` (#68)
13+
14+
**New features**
15+
16+
- Display a better message when having 403 on create_collection and
17+
create_record methods (#49)
18+
- Expose ``get_endpoints`` as part of the client API (#60)
19+
- Add a ``server_info`` method to retrieve the root url info (#70)
20+
21+
**Internal changes**
22+
23+
- Rename the Batch class into BatchSession (#52)
24+
- Change readthedocs.org urls in readthedocs.io (#71)
1325

1426

1527
4.1.0 (2016-04-26)

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include *.rst README.rst CHANGELOG.rst
1+
include *.rst README.rst CHANGELOG.rst tox.ini Makefile .coveragerc
22
include *.txt
33
include LICENSE
44
recursive-include kinto_client *.ini

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ need-kinto-running:
3030
@curl http://localhost:8888/v0/ 2>/dev/null 1>&2 || (echo "Run 'make runkinto' before starting tests." && exit 1)
3131

3232
runkinto: install-dev
33-
$(VENV)/bin/cliquet --ini kinto_client/tests/config/kinto.ini migrate
34-
$(VENV)/bin/pserve kinto_client/tests/config/kinto.ini --reload
33+
$(VENV)/bin/kinto --ini kinto_client/tests/config/kinto.ini migrate
34+
$(VENV)/bin/kinto --ini kinto_client/tests/config/kinto.ini start
3535

3636
tests-once: install-dev
3737
$(VENV)/bin/py.test --cov-report term-missing --cov-fail-under 100 --cov kinto_client

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ at creation time, so that this value will be used by default.
8585
Getting server information
8686
--------------------------
8787

88-
You can use the ``server_info`` methods to get the server information::
88+
You can use the ``server_info`` method to get the server information::
8989

9090
.. code-block:: python
9191
9292
from kinto_client import Client
9393
9494
client = Client(server_url='http://localhost:8888/v1')
95-
infos = client.server_info()
96-
assert 'schema' in infos['capabilities'], "Server doesn't supports schema validation."
95+
info = client.server_info()
96+
assert 'schema' in info['capabilities'], "Server doesn't support schema validation."
9797
9898
9999
Handling buckets

kinto_client/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ def create_record(self, data, id=None, collection=None, permissions=None,
332332
except KintoException as e:
333333
if e.response.status_code == 403:
334334
msg = ("Unauthorized. Please check that the collection exists "
335-
"and that you have the permission to create or write on "
336-
"this collection record.")
335+
"and that you have the permission to create or write on"
336+
" this collection record.")
337337
e = KintoException(msg, e)
338338
raise e
339339

setup.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,21 @@
2121
REQUIREMENTS.append('ndg-httpsclient')
2222
REQUIREMENTS.append('pyasn1')
2323

24+
test_requirements = [
25+
'pytest',
26+
'pytest-cache',
27+
'pytest-cover',
28+
'pytest-sugar',
29+
'pytest-xdist',
30+
'mock',
31+
'kinto',
32+
'unittest2',
33+
'unidecode',
34+
'six',
35+
]
2436

2537
setup(name='kinto-client',
26-
version='5.0.0.dev0',
38+
version='5.0.0',
2739
description='Kinto client',
2840
long_description=README,
2941
license='Apache License (2.0)',
@@ -43,4 +55,6 @@
4355
packages=find_packages(),
4456
include_package_data=True,
4557
zip_safe=False,
46-
install_requires=REQUIREMENTS)
58+
install_requires=REQUIREMENTS,
59+
test_suite='kinto_client.tests',
60+
tests_require=test_requirements)

0 commit comments

Comments
 (0)