Merge branch 'prepare-5.0.0'

Kinto · May 13, 2016 · 1ed21d3 · 1ed21d3
2 parents 6a9ce92 + 471e1de
commit 1ed21d3
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,12 +4,24 @@ CHANGELOG
 This document describes changes between each past release.
 
 
-5.0.0 (unreleased)
+5.0.0 (2016-05-12)
 ==================
 
 **Breaking changes**
 
-- Rename the last_modified client parameter into if_match (#68)
+- Rename the ``last_modified`` client parameter into ``if_match`` (#68)
+
+**New features**
+
+- Display a better message when having 403 on create_collection and
+  create_record methods (#49)
+- Expose ``get_endpoints`` as part of the client API (#60)
+- Add a ``server_info`` method to retrieve the root url info (#70)
+
+**Internal changes**
+
+- Rename the Batch class into BatchSession (#52)
+- Change readthedocs.org urls in readthedocs.io (#71)
 
 
 4.1.0 (2016-04-26)

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include *.rst README.rst CHANGELOG.rst
+include *.rst README.rst CHANGELOG.rst tox.ini Makefile .coveragerc
 include *.txt
 include LICENSE
 recursive-include kinto_client *.ini
diff --git a/Makefile b/Makefile
@@ -30,8 +30,8 @@ need-kinto-running:
 	@curl http://localhost:8888/v0/ 2>/dev/null 1>&2 || (echo "Run 'make runkinto' before starting tests." && exit 1)
 
 runkinto: install-dev
-	$(VENV)/bin/cliquet --ini kinto_client/tests/config/kinto.ini migrate
-	$(VENV)/bin/pserve kinto_client/tests/config/kinto.ini --reload
+	$(VENV)/bin/kinto --ini kinto_client/tests/config/kinto.ini migrate
+	$(VENV)/bin/kinto --ini kinto_client/tests/config/kinto.ini start
 
 tests-once: install-dev
 	$(VENV)/bin/py.test --cov-report term-missing --cov-fail-under 100 --cov kinto_client

diff --git a/README.rst b/README.rst
@@ -85,15 +85,15 @@ at creation time, so that this value will be used by default.
 Getting server information
 --------------------------
 
-You can use the ``server_info`` methods to get the server information::
+You can use the ``server_info`` method to get the server information::
 
 .. code-block:: python
 
     from kinto_client import Client
 
     client = Client(server_url='http://localhost:8888/v1')
-    infos = client.server_info()
-    assert 'schema' in infos['capabilities'], "Server doesn't supports schema validation."
+    info = client.server_info()
+    assert 'schema' in info['capabilities'], "Server doesn't support schema validation."
 
 
 Handling buckets

diff --git a/kinto_client/__init__.py b/kinto_client/__init__.py
@@ -332,8 +332,8 @@ def create_record(self, data, id=None, collection=None, permissions=None,
         except KintoException as e:
             if e.response.status_code == 403:
                 msg = ("Unauthorized. Please check that the collection exists "
-                       "and that you have the permission to create or write on "
-                       "this collection record.")
+                       "and that you have the permission to create or write on"
+                       " this collection record.")
                 e = KintoException(msg, e)
             raise e
 

diff --git a/setup.py b/setup.py
@@ -21,9 +21,21 @@
     REQUIREMENTS.append('ndg-httpsclient')
     REQUIREMENTS.append('pyasn1')
 
+test_requirements = [
+    'pytest',
+    'pytest-cache',
+    'pytest-cover',
+    'pytest-sugar',
+    'pytest-xdist',
+    'mock',
+    'kinto',
+    'unittest2',
+    'unidecode',
+    'six',
+]
 
 setup(name='kinto-client',
-      version='5.0.0.dev0',
+      version='5.0.0',
       description='Kinto client',
       long_description=README,
       license='Apache License (2.0)',
@@ -43,4 +55,6 @@
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires=REQUIREMENTS)
+      install_requires=REQUIREMENTS,
+      test_suite='kinto_client.tests',
+      tests_require=test_requirements)