From 47c692b8d2c3140ae3b0bf996510d2480f9a4fd3 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Tue, 17 Sep 2013 21:08:50 +0200 Subject: Switch to other ldapdb fork We can update the branch version every time when stuff changes --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 038469a..f63e9ab 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,7 +2,7 @@ django>=1.5 django-auth-ldap>=1.1.4 django-compressor>=1.3 django-otp>=0.1.7 -git+https://github.com/mgorny/django-ldapdb@bind_as-2#egg=django-ldapdb +git+https://github.com/gentoo/django-ldapdb@okupy_v1#egg=django-ldapdb paramiko>=1.10.1 passlib>=1.6.1 pycrypto>=2.6 -- cgit v1.2.3-65-gdbad From 4aaadaf89b6a328792b2edacaba48d41afff0372 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Tue, 17 Sep 2013 21:10:23 +0200 Subject: Minor fix --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 5ccf736..e8a250a 100755 --- a/setup.py +++ b/setup.py @@ -15,9 +15,8 @@ with open('requirements/base.txt', 'r') as f: base_deps = [] for line in f: if line.startswith('git+') or line.startswith('hg+'): - base_deps.append(line.split('#egg=')[1]) - else: - base_deps.append(line.split('\n')[0]) + line = line.split('#egg=')[1] + base_deps.append(line.replace('\n', '')) setup( name='okupy', -- cgit v1.2.3-65-gdbad From 21a9331ec2bd3975643caae5b7a59090089123e6 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Tue, 17 Sep 2013 21:11:28 +0200 Subject: remove dependency_links from setup.py It's broken and we don't want to fix it --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index e8a250a..88c63e0 100755 --- a/setup.py +++ b/setup.py @@ -44,9 +44,6 @@ setup( 'Topic :: Software Development', ], - dependency_links=[ - 'https://github.com/tampakrap/django-ldapdb/archive/okupy.tar.gz#egg=django-ldapdb', - ], install_requires=base_deps, setup_requires=[ 'setuptools>=0.6c11', -- cgit v1.2.3-65-gdbad