Clean up dependencies and Travis

This commit is contained in:
Lauri Võsandi 2017-04-13 20:52:09 +00:00
parent 52d35012a4
commit 02b2f041cc
4 changed files with 23 additions and 15 deletions

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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"