Merge pull request #13 from nephila/feature/setup

Solve dependency on parler documenting the pip 1.5 behavior
This commit is contained in:
Iacopo Spalletti 2014-04-11 12:48:42 +02:00
commit b38e5ed42a
2 changed files with 10 additions and 3 deletions

View file

@ -14,6 +14,13 @@ A djangoCMS 3 blog application.
Still experimental and untested. You are welcome if you want to try it; if
you encounter any issue, please open an issue.
.. warning:: Due to changes in pip 1.5, dependency_links is not respected
anymore (see http://www.pip-installer.org/en/develop/dependency_links.html);
djangocms-blog depends on development version of django-parler; thus,
to proper install it you must invoke pip with `--process-dependency-links`
options as stated below.
We're going to fix this soon, sorry for the inconvenience.
Documentation
-------------
@ -24,7 +31,7 @@ Quickstart
Install djangocms-blog::
pip install djangocms-blog
pip install --process-dependency-links djangocms-blog
Add ``djangocms_blog`` and its dependencies to INSTALLED_APPS::

View file

@ -36,7 +36,7 @@ setup(
],
include_package_data=True,
install_requires=[
'django-parler>=1.0',
'django-parler>1.0a1',
'django-cms>=3.0c1',
'django-taggit',
'django-filer',
@ -47,7 +47,7 @@ setup(
'django-admin-enhancer',
],
dependency_links=[
'https://github.com/edoburu/django-parler/archive/cdd500bb28a234d870274e73cba9d7020f1ef0b1.zip#egg=django-parler-1.0',
'https://github.com/edoburu/django-parler/archive/master.zip#egg=django-parler-1.0',
],
license="BSD",
zip_safe=False,