tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 05:34:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

support PyYAML up to 5.x version

Browse Source 
Signed-off-by: Sergey Fursov <geyser85@gmail.com>
This commit is contained in:
Sergey Fursov 2019-03-31 12:45:50 +07:00 committed by Nicolas De loof
parent 33eeef41ab
commit c818bfc62c
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -17,7 +17,7 @@ paramiko==2.6.0
pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6' pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
PySocks==1.7.1 PySocks==1.7.1
PyYAML==4.2b1 PyYAML==5.3
requests==2.22.0 requests==2.22.0
six==1.12.0 six==1.12.0
subprocess32==3.5.4; python_version < '3.2' subprocess32==3.5.4; python_version < '3.2'

2
setup.py
View File

@ -32,7 +32,7 @@ def find_version(*file_paths):
install_requires = [ install_requires = [
'cached-property >= 1.2.0, < 2', 'cached-property >= 1.2.0, < 2',
'docopt >= 0.6.1, < 1', 'docopt >= 0.6.1, < 1',
'PyYAML >= 3.10, < 5', 'PyYAML >= 3.10, < 6',
'requests >= 2.20.0, < 3', 'requests >= 2.20.0, < 3',
'texttable >= 0.9.0, < 2', 'texttable >= 0.9.0, < 2',
'websocket-client >= 0.32.0, < 1', 'websocket-client >= 0.32.0, < 1',

28
tests/acceptance/cli_test.py
View File

@ -269,7 +269,7 @@ services:
# assert there are no python objects encoded in the output # assert there are no python objects encoded in the output
assert '!!' not in result.stdout assert '!!' not in result.stdout
output = yaml.load(result.stdout) output = yaml.safe_load(result.stdout)
expected = { expected = {
'version': '2.0', 'version': '2.0',
'volumes': {'data': {'driver': 'local'}}, 'volumes': {'data': {'driver': 'local'}},
@ -294,7 +294,7 @@ services:
def test_config_restart(self): def test_config_restart(self):
self.base_dir = 'tests/fixtures/restart' self.base_dir = 'tests/fixtures/restart'
result = self.dispatch(['config']) result = self.dispatch(['config'])
assert yaml.load(result.stdout) == { assert yaml.safe_load(result.stdout) == {
'version': '2.0', 'version': '2.0',
'services': { 'services': {
'never': { 'never': {
@ -323,7 +323,7 @@ services:
def test_config_external_network(self): def test_config_external_network(self):
self.base_dir = 'tests/fixtures/networks' self.base_dir = 'tests/fixtures/networks'
result = self.dispatch(['-f', 'external-networks.yml', 'config']) result = self.dispatch(['-f', 'external-networks.yml', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert 'networks' in json_result assert 'networks' in json_result
assert json_result['networks'] == { assert json_result['networks'] == {
'networks_foo': { 'networks_foo': {
@ -337,7 +337,7 @@ services:
def test_config_with_dot_env(self): def test_config_with_dot_env(self):
self.base_dir = 'tests/fixtures/default-env-file' self.base_dir = 'tests/fixtures/default-env-file'
result = self.dispatch(['config']) result = self.dispatch(['config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert json_result == { assert json_result == {
'services': { 'services': {
'web': { 'web': {
@ -352,7 +352,7 @@ services:
def test_config_with_env_file(self): def test_config_with_env_file(self):
self.base_dir = 'tests/fixtures/default-env-file' self.base_dir = 'tests/fixtures/default-env-file'
result = self.dispatch(['--env-file', '.env2', 'config']) result = self.dispatch(['--env-file', '.env2', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert json_result == { assert json_result == {
'services': { 'services': {
'web': { 'web': {
@ -367,7 +367,7 @@ services:
def test_config_with_dot_env_and_override_dir(self): def test_config_with_dot_env_and_override_dir(self):
self.base_dir = 'tests/fixtures/default-env-file' self.base_dir = 'tests/fixtures/default-env-file'
result = self.dispatch(['--project-directory', 'alt/', 'config']) result = self.dispatch(['--project-directory', 'alt/', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert json_result == { assert json_result == {
'services': { 'services': {
'web': { 'web': {
@ -382,7 +382,7 @@ services:
def test_config_external_volume_v2(self): def test_config_external_volume_v2(self):
self.base_dir = 'tests/fixtures/volumes' self.base_dir = 'tests/fixtures/volumes'
result = self.dispatch(['-f', 'external-volumes-v2.yml', 'config']) result = self.dispatch(['-f', 'external-volumes-v2.yml', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert 'volumes' in json_result assert 'volumes' in json_result
assert json_result['volumes'] == { assert json_result['volumes'] == {
'foo': { 'foo': {
@ -398,7 +398,7 @@ services:
def test_config_external_volume_v2_x(self): def test_config_external_volume_v2_x(self):
self.base_dir = 'tests/fixtures/volumes' self.base_dir = 'tests/fixtures/volumes'
result = self.dispatch(['-f', 'external-volumes-v2-x.yml', 'config']) result = self.dispatch(['-f', 'external-volumes-v2-x.yml', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert 'volumes' in json_result assert 'volumes' in json_result
assert json_result['volumes'] == { assert json_result['volumes'] == {
'foo': { 'foo': {
@ -414,7 +414,7 @@ services:
def test_config_external_volume_v3_x(self): def test_config_external_volume_v3_x(self):
self.base_dir = 'tests/fixtures/volumes' self.base_dir = 'tests/fixtures/volumes'
result = self.dispatch(['-f', 'external-volumes-v3-x.yml', 'config']) result = self.dispatch(['-f', 'external-volumes-v3-x.yml', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert 'volumes' in json_result assert 'volumes' in json_result
assert json_result['volumes'] == { assert json_result['volumes'] == {
'foo': { 'foo': {
@ -430,7 +430,7 @@ services:
def test_config_external_volume_v3_4(self): def test_config_external_volume_v3_4(self):
self.base_dir = 'tests/fixtures/volumes' self.base_dir = 'tests/fixtures/volumes'
result = self.dispatch(['-f', 'external-volumes-v3-4.yml', 'config']) result = self.dispatch(['-f', 'external-volumes-v3-4.yml', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert 'volumes' in json_result assert 'volumes' in json_result
assert json_result['volumes'] == { assert json_result['volumes'] == {
'foo': { 'foo': {
@ -446,7 +446,7 @@ services:
def test_config_external_network_v3_5(self): def test_config_external_network_v3_5(self):
self.base_dir = 'tests/fixtures/networks' self.base_dir = 'tests/fixtures/networks'
result = self.dispatch(['-f', 'external-networks-v3-5.yml', 'config']) result = self.dispatch(['-f', 'external-networks-v3-5.yml', 'config'])
json_result = yaml.load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert 'networks' in json_result assert 'networks' in json_result
assert json_result['networks'] == { assert json_result['networks'] == {
'foo': { 'foo': {
@ -462,7 +462,7 @@ services:
def test_config_v1(self): def test_config_v1(self):
self.base_dir = 'tests/fixtures/v1-config' self.base_dir = 'tests/fixtures/v1-config'
result = self.dispatch(['config']) result = self.dispatch(['config'])
assert yaml.load(result.stdout) == { assert yaml.safe_load(result.stdout) == {
'version': '2.1', 'version': '2.1',
'services': { 'services': {
'net': { 'net': {
@ -487,7 +487,7 @@ services:
self.base_dir = 'tests/fixtures/v3-full' self.base_dir = 'tests/fixtures/v3-full'
result = self.dispatch(['config']) result = self.dispatch(['config'])
assert yaml.load(result.stdout) == { assert yaml.safe_load(result.stdout) == {
'version': '3.5', 'version': '3.5',
'volumes': { 'volumes': {
'foobar': { 'foobar': {
@ -564,7 +564,7 @@ services:
self.base_dir = 'tests/fixtures/compatibility-mode' self.base_dir = 'tests/fixtures/compatibility-mode'
result = self.dispatch(['--compatibility', 'config']) result = self.dispatch(['--compatibility', 'config'])
assert yaml.load(result.stdout) == { assert yaml.safe_load(result.stdout) == {
'version': '2.3', 'version': '2.3',
'volumes': {'foo': {'driver': 'default'}}, 'volumes': {'foo': {'driver': 'default'}},
'networks': {'bar': {}}, 'networks': {'bar': {}},

20
tests/unit/config/config_test.py
View File

@ -5060,7 +5060,7 @@ class HealthcheckTest(unittest.TestCase):
}) })
) )
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
serialized_service = serialized_config['services']['test'] serialized_service = serialized_config['services']['test']
assert serialized_service['healthcheck'] == { assert serialized_service['healthcheck'] == {
@ -5087,7 +5087,7 @@ class HealthcheckTest(unittest.TestCase):
}) })
) )
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
serialized_service = serialized_config['services']['test'] serialized_service = serialized_config['services']['test']
assert serialized_service['healthcheck'] == { assert serialized_service['healthcheck'] == {
@ -5294,7 +5294,7 @@ class SerializeTest(unittest.TestCase):
'secrets': secrets_dict 'secrets': secrets_dict
})) }))
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
serialized_service = serialized_config['services']['web'] serialized_service = serialized_config['services']['web']
assert secret_sort(serialized_service['secrets']) == secret_sort(service_dict['secrets']) assert secret_sort(serialized_service['secrets']) == secret_sort(service_dict['secrets'])
assert 'secrets' in serialized_config assert 'secrets' in serialized_config
@ -5309,7 +5309,7 @@ class SerializeTest(unittest.TestCase):
} }
], volumes={}, networks={}, secrets={}, configs={}) ], volumes={}, networks={}, secrets={}, configs={})
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
assert '8080:80/tcp' in serialized_config['services']['web']['ports'] assert '8080:80/tcp' in serialized_config['services']['web']['ports']
def test_serialize_ports_with_ext_ip(self): def test_serialize_ports_with_ext_ip(self):
@ -5321,7 +5321,7 @@ class SerializeTest(unittest.TestCase):
} }
], volumes={}, networks={}, secrets={}, configs={}) ], volumes={}, networks={}, secrets={}, configs={})
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
assert '127.0.0.1:8080:80/tcp' in serialized_config['services']['web']['ports'] assert '127.0.0.1:8080:80/tcp' in serialized_config['services']['web']['ports']
def test_serialize_configs(self): def test_serialize_configs(self):
@ -5349,7 +5349,7 @@ class SerializeTest(unittest.TestCase):
'configs': configs_dict 'configs': configs_dict
})) }))
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
serialized_service = serialized_config['services']['web'] serialized_service = serialized_config['services']['web']
assert secret_sort(serialized_service['configs']) == secret_sort(service_dict['configs']) assert secret_sort(serialized_service['configs']) == secret_sort(service_dict['configs'])
assert 'configs' in serialized_config assert 'configs' in serialized_config
@ -5389,7 +5389,7 @@ class SerializeTest(unittest.TestCase):
} }
config_dict = config.load(build_config_details(cfg)) config_dict = config.load(build_config_details(cfg))
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
serialized_service = serialized_config['services']['web'] serialized_service = serialized_config['services']['web']
assert serialized_service['environment']['CURRENCY'] == '$$' assert serialized_service['environment']['CURRENCY'] == '$$'
assert serialized_service['command'] == 'echo $$FOO' assert serialized_service['command'] == 'echo $$FOO'
@ -5411,7 +5411,7 @@ class SerializeTest(unittest.TestCase):
} }
config_dict = config.load(build_config_details(cfg), interpolate=False) config_dict = config.load(build_config_details(cfg), interpolate=False)
serialized_config = yaml.load(serialize_config(config_dict, escape_dollar=False)) serialized_config = yaml.safe_load(serialize_config(config_dict, escape_dollar=False))
serialized_service = serialized_config['services']['web'] serialized_service = serialized_config['services']['web']
assert serialized_service['environment']['CURRENCY'] == '$' assert serialized_service['environment']['CURRENCY'] == '$'
assert serialized_service['command'] == 'echo $FOO' assert serialized_service['command'] == 'echo $FOO'
@ -5430,7 +5430,7 @@ class SerializeTest(unittest.TestCase):
config_dict = config.load(build_config_details(cfg)) config_dict = config.load(build_config_details(cfg))
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
serialized_service = serialized_config['services']['web'] serialized_service = serialized_config['services']['web']
assert serialized_service['command'] == 'echo 十六夜　咲夜' assert serialized_service['command'] == 'echo 十六夜　咲夜'
@ -5446,6 +5446,6 @@ class SerializeTest(unittest.TestCase):
} }
config_dict = config.load(build_config_details(cfg)) config_dict = config.load(build_config_details(cfg))
serialized_config = yaml.load(serialize_config(config_dict)) serialized_config = yaml.safe_load(serialize_config(config_dict))
serialized_volume = serialized_config['volumes']['test'] serialized_volume = serialized_config['volumes']['test']
assert serialized_volume['external'] is False assert serialized_volume['external'] is False