Skip to content
This repository has been archived by the owner on Mar 23, 2019. It is now read-only.

Commit

Permalink
Loosen requirements.txt and remove transitive dependencies
Browse files Browse the repository at this point in the history
ruamel.ordereddict is no longer used directly, we always call via
ruamel.yaml.compat and the ruamel.yaml install checks if it's needed.
  • Loading branch information
ryansb committed Apr 5, 2017
1 parent 2a07fd1 commit ce491bd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 36 deletions.
34 changes: 6 additions & 28 deletions conductor-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
git+https://github.com/ansible/[email protected]#egg=2.3.3.0
asn1crypto==0.22.0
backports.ssl-match-hostname==3.5.0.1
cffi==1.10.0
colorama==0.3.7
cryptography==1.8.1
docker==2.2.0
docker-pycreds==0.2.1
enum34==1.1.6
httplib2==0.10.3
idna==2.5
ipaddress==1.0.18
Jinja2==2.9.5
MarkupSafe==1.0
packaging==16.8
paramiko==2.1.2
pyasn1==0.2.3
pycparser==2.17
pycrypto==2.6.1
pyparsing==2.2.0
PyYAML==3.12
requests==2.13.0
ruamel.ordereddict==0.4.9
ruamel.yaml==0.14.2
six==1.10.0
structlog==16.1.0
typing==3.5.3.0
websocket-client==0.40.0
wheel==0.24.0
PyYAML>=3.12
requests>=2.13.0
ruamel.yaml>=0.14.2
six>=1.10.0
structlog[dev]>=16.1.0
docker-compose>=1.7.0
2 changes: 1 addition & 1 deletion container/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def hostcmd_build(base_path, project_name, engine_name, var_file=None,
@host_only
def hostcmd_run(base_path, project_name, engine_name, var_file=None, cache=True,
**kwargs):
logger.info('Got extra args to `run` command', arguments=kwargs)
logger.debug('Got extra args to `run` command', arguments=kwargs)
config = get_config(base_path, var_file=var_file)
assert_initialized(base_path)

Expand Down
13 changes: 6 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Jinja2>=2.8
PyYAML>=3.11
six
requests
ruamel.ordereddict==0.4.9; python_version <= '2.7'
ruamel.yaml==0.14.2
structlog[dev]
Jinja2>=2.9
PyYAML>=3.12
six>=1.10
requests>=2.13
ruamel.yaml>=0.14.2
structlog[dev]>=16.1

0 comments on commit ce491bd

Please sign in to comment.