From a2b54ea8ec2549dd9100684266ee89a5448de892 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Fri, 11 Apr 2014 12:19:39 +0200 Subject: [PATCH] Solve dependency on parler documenting the pip 1.5 behavior --- README.rst | 9 ++++++++- setup.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index c281bb0..f1847e2 100644 --- a/README.rst +++ b/README.rst @@ -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:: diff --git a/setup.py b/setup.py index 35b5c5f..3d6879a 100755 --- a/setup.py +++ b/setup.py @@ -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,