Skip to content

Commit

Permalink
Merge branch 'release/0.7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
pavlov99 committed Mar 6, 2015
2 parents 56dd1c6 + cb14fb1 commit 54f51b3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
11 changes: 0 additions & 11 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,3 @@ Documentation
Library: http://jsonapi.readthedocs.org/

Api Specification: http://jsonapi.org/

Quick start
-----------
1. Add "jsonapi" to your INSTALLED_APPS setting like this::

INSTALLED_APPS = (
...
'jsonapi',
)

It is required for documentation. If you do not plan to use autogenerated docs, you may skip this step.
2 changes: 1 addition & 1 deletion jsonapi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
""" JSON:API realization."""
__version = (0, 7, 3)
__version = (0, 7, 4)

__version__ = version = '.'.join(map(str, __version))
__project__ = PROJECT = __name__
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
import os
from setuptools import setup, find_packages
from setuptools import setup
from jsonapi import version
#
# Import multiprocessing to prevent test run problem. In case of nosetests
Expand All @@ -22,7 +22,8 @@ def read(fname):
setup(
name="jsonapi",
version=version,
packages=find_packages(),
packages=["jsonapi"],
include_package_data=True,
# metadata for upload to PyPI
author="Kirill Pavlov",
author_email="kirill.pavlov@phystech.edu",
Expand Down

0 comments on commit 54f51b3

Please sign in to comment.