diff options
| author |   Theo Chatzimichos <tampakrap@gmail.com> | 2013-09-17 14:56:54 -0700 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gmail.com> | 2013-09-17 14:56:54 -0700 |
| commit | 29408d484c1c3d51fe37ecceb81715997d79c012 (patch) | |
| tree | 57cd229d6961fc331f5c4cab5eecf4d30d0ce871 | |
| parent | Merge pull request #95 from mgorny/clean-ldapdb (diff) | |
| parent | remove dependency_links from setup.py (diff) | |
| download | identity.gentoo.org-29408d484c1c3d51fe37ecceb81715997d79c012.tar.gz identity.gentoo.org-29408d484c1c3d51fe37ecceb81715997d79c012.tar.bz2 identity.gentoo.org-29408d484c1c3d51fe37ecceb81715997d79c012.zip | |
Merge pull request #96 from tampakrap/setuppy
minor fixes to the build system
| -rw-r--r-- | requirements/base.txt | 2 | ||||
| -rwxr-xr-x | setup.py | 8 |
2 files changed, 3 insertions, 7 deletions
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 @@ -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', @@ -45,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', |