tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

requirements: update jsonschema dependency 

Fixes: https://github.com/docker/compose/issues/6347

Signed-off-by: Antonio Gutierrez <chibby0ne@gmail.com>
This commit is contained in:
Antonio Gutierrez 2019-04-02 15:04:26 +02:00
parent 7a7c9ff67a
commit 66856e884c
No known key found for this signature in database
GPG Key ID: 87442126EE4B90AE
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements-build.txt
View File

@ -1 +1 @@
pyinstaller==3.4 pyinstaller==3.5

4
requirements.txt
View File

@ -11,14 +11,14 @@ enum34==1.1.6; python_version < '3.4'
functools32==3.2.3.post2; python_version < '3.2' functools32==3.2.3.post2; python_version < '3.2'
idna==2.5 idna==2.5
ipaddress==1.0.18 ipaddress==1.0.18
jsonschema==2.6.0 jsonschema==3.0.1
paramiko==2.4.2 paramiko==2.4.2
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.6.7 PySocks==1.6.7
PyYAML==4.2b1 PyYAML==4.2b1
requests==2.22.0 requests==2.22.0
six==1.10.0 six==1.12.0
texttable==1.6.2 texttable==1.6.2
urllib3==1.24.2; python_version == '3.3' urllib3==1.24.2; python_version == '3.3'
websocket-client==0.32.0 websocket-client==0.32.0

7
script/build/linux-entrypoint
View File

@ -20,10 +20,11 @@ echo "${DOCKER_COMPOSE_GITSHA}" > compose/GITSHA
export PATH="${CODE_PATH}/pyinstaller:${PATH}" export PATH="${CODE_PATH}/pyinstaller:${PATH}"
if [ ! -z "${BUILD_BOOTLOADER}" ]; then if [ ! -z "${BUILD_BOOTLOADER}" ]; then
# Build bootloader for alpine # Build bootloader for alpine; develop is the main branch
git clone --single-branch --branch master https://github.com/pyinstaller/pyinstaller.git /tmp/pyinstaller git clone --single-branch --branch develop https://github.com/pyinstaller/pyinstaller.git /tmp/pyinstaller
cd /tmp/pyinstaller/bootloader cd /tmp/pyinstaller/bootloader
git checkout v3.4 # Checkout commit corresponding to version in requirements-build
git checkout v3.5
"${VENV}"/bin/python3 ./waf configure --no-lsb all "${VENV}"/bin/python3 ./waf configure --no-lsb all
"${VENV}"/bin/pip3 install .. "${VENV}"/bin/pip3 install ..
cd "${CODE_PATH}" cd "${CODE_PATH}"

2
setup.py
View File

@ -39,7 +39,7 @@ install_requires = [
'docker[ssh] >= 3.7.0, < 5', 'docker[ssh] >= 3.7.0, < 5',
'dockerpty >= 0.4.1, < 1', 'dockerpty >= 0.4.1, < 1',
'six >= 1.3.0, < 2', 'six >= 1.3.0, < 2',
'jsonschema >= 2.5.1, < 3', 'jsonschema >= 2.5.1, < 4',
] ]