diff --git a/.travis.yml b/.travis.yml index 8bb99f4..b4a9bab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,12 @@ cache: addons: apt: packages: - - python-ldap - python-xattr + - python-setproctitle + - python-falcon + - python-markdown + - python-jinja2 + - python-click + - python-configparser + - python-ipaddress + - python-humanize diff --git a/certidude/cli.py b/certidude/cli.py index 26975a7..83c93d7 100755 --- a/certidude/cli.py +++ b/certidude/cli.py @@ -23,9 +23,7 @@ from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives import hashes, serialization from cryptography.hazmat.primitives.asymmetric import rsa from datetime import datetime, timedelta -from humanize import naturaltime from jinja2 import Environment, PackageLoader -from setproctitle import setproctitle import const logger = logging.getLogger(__name__) @@ -972,7 +970,7 @@ def certidude_list(verbose, show_key_type, show_extensions, show_path, show_sign # e - expired # y - not valid yet # r - revoked - + from humanize import naturaltime from certidude import authority def dump_common(common_name, path, cert): @@ -1074,6 +1072,7 @@ def certidude_cron(): @click.option("-l", "--listen", default="0.0.0.0", help="Listen address") @click.option("-f", "--fork", default=False, is_flag=True, help="Fork to background") def certidude_serve(port, listen, fork): + from setproctitle import setproctitle from certidude.signer import SignServer from certidude import const click.echo("Using configuration from: %s" % const.CONFIG_PATH) diff --git a/requirements.txt b/requirements.txt index b9eed00..a3c3b91 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,6 @@ -click==6.7 -configparser==3.5.0 -cryptography==1.7.2 -falcon==1.1.0 -humanize==0.5.1 -ipaddress==1.0.18 -Jinja2==2.9.5 -Markdown==2.6.8 -pyldap==2.4.28 -python-dateutil==2.6.0 -requests==2.10.0 +click>=6.7 +configparser>=3.5.0 +cryptography>=1.7.1 +Jinja2>=2.8 +requests>=2.12.4 +requests-kerberos>=0.7.0 diff --git a/setup.py b/setup.py index 4884ee6..4e26dd3 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,14 @@ setup( "certidude.api" ], long_description=open("README.rst").read(), + # Include here only stuff required to run certidude client install_requires=[ + "click", + "cryptography", + "configparser", + "jinja2", + "requests", + "requests-kerberos" ], scripts=[ "misc/certidude"