Skip to content

Commit

Permalink
Move install_requires into setup.py
Browse files Browse the repository at this point in the history
pip install python-ldap will now automatically install requirements and
ensure correct versions. requirements.txt is no longer needed.

https://github.com/python-ldap/python-ldap/pull/3
Signed-off-by: Christian Heimes <cheimes@redhat.com>
  • Loading branch information
Christian Heimes authored and Petr Viktorin committed Nov 25, 2017
1 parent b91e5d2 commit 5d15857
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
3 changes: 0 additions & 3 deletions requirements.txt

This file was deleted.

6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ class OpenLDAP2:
if has_setuptools:
kwargs = dict(
include_package_data = True,
install_requires = ['setuptools'],
install_requires = [
'setuptools',
'pyasn1 >= 0.3.7',
'pyasn1_modules >= 0.1.5',
],
zip_safe = False,
python_requires = '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
)
Expand Down
5 changes: 1 addition & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
envlist = py27,py33,py34,py35,py36,coverage-report

[testenv]
deps =
coverage
pyasn1
pyasn1_modules
deps = coverage
commands = {envpython} -m coverage run --parallel setup.py test
passenv = WITH_GCOV

Expand Down

0 comments on commit 5d15857

Please sign in to comment.