mirror of
https://github.com/docker/compose.git
synced 2025-04-08 17:05:13 +02:00
Bump python version from 3.6.8 to 3.7.2
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
This commit is contained in:
parent
768c788da9
commit
a734371e7f
@ -13,7 +13,7 @@ jobs:
|
||||
command: sudo pip install --upgrade tox==2.1.1 virtualenv==16.2.0
|
||||
- run:
|
||||
name: unit tests
|
||||
command: tox -e py27,py36,py37 -- tests/unit
|
||||
command: tox -e py27,py37 -- tests/unit
|
||||
|
||||
build-osx-binary:
|
||||
macos:
|
||||
|
@ -1,5 +1,5 @@
|
||||
FROM docker:18.06.1 as docker
|
||||
FROM python:3.6
|
||||
FROM python:3.7.2-stretch
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update -qq; \
|
||||
@ -33,4 +33,4 @@ RUN tox --notest
|
||||
ADD . /code/
|
||||
RUN chown -R user /code/
|
||||
|
||||
ENTRYPOINT ["/code/.tox/py36/bin/docker-compose"]
|
||||
ENTRYPOINT ["/code/.tox/py37/bin/docker-compose"]
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM python:3.6
|
||||
FROM python:3.7.2-stretch
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update -qq; \
|
||||
@ -36,4 +36,4 @@ RUN tox --notest
|
||||
ADD . /code/
|
||||
RUN chown -R user /code/
|
||||
|
||||
ENTRYPOINT ["/code/.tox/py36/bin/docker-compose"]
|
||||
ENTRYPOINT ["/code/.tox/py37/bin/docker-compose"]
|
||||
|
3
Jenkinsfile
vendored
3
Jenkinsfile
vendored
@ -37,7 +37,7 @@ def runTests = { Map settings ->
|
||||
def pythonVersions = settings.get("pythonVersions", null)
|
||||
|
||||
if (!pythonVersions) {
|
||||
throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py27,py36')`")
|
||||
throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py27,py37')`")
|
||||
}
|
||||
if (!dockerVersions) {
|
||||
throw new Exception("Need Docker versions to test. e.g.: `runTests(dockerVersions: 'all')`")
|
||||
@ -77,7 +77,6 @@ def docker_versions = get_versions(2)
|
||||
for (int i = 0; i < docker_versions.length; i++) {
|
||||
def dockerVersion = docker_versions[i]
|
||||
testMatrix["${dockerVersion}_py27"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py27"])
|
||||
testMatrix["${dockerVersion}_py36"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py36"])
|
||||
testMatrix["${dockerVersion}_py37"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py37"])
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
version: '{branch}-{build}'
|
||||
|
||||
install:
|
||||
- "SET PATH=C:\\Python36-x64;C:\\Python36-x64\\Scripts;%PATH%"
|
||||
- "SET PATH=C:\\Python37-x64;C:\\Python37-x64\\Scripts;%PATH%"
|
||||
- "python --version"
|
||||
- "pip install tox==2.9.1 virtualenv==15.1.0"
|
||||
|
||||
@ -10,7 +10,7 @@ install:
|
||||
build: false
|
||||
|
||||
test_script:
|
||||
- "tox -e py27,py36,py37 -- tests/unit"
|
||||
- "tox -e py27,py37 -- tests/unit"
|
||||
- ps: ".\\script\\build\\windows.ps1"
|
||||
|
||||
artifacts:
|
||||
|
@ -1 +1 @@
|
||||
pyinstaller==3.3.1
|
||||
pyinstaller==3.4
|
||||
|
@ -3,7 +3,7 @@
|
||||
set -ex
|
||||
|
||||
TARGET=dist/docker-compose-$(uname -s)-$(uname -m)
|
||||
VENV=/code/.tox/py36
|
||||
VENV=/code/.tox/py37
|
||||
|
||||
mkdir -p `pwd`/dist
|
||||
chmod 777 `pwd`/dist
|
||||
|
@ -6,11 +6,11 @@
|
||||
#
|
||||
# http://git-scm.com/download/win
|
||||
#
|
||||
# 2. Install Python 3.6.4:
|
||||
# 2. Install Python 3.7.2:
|
||||
#
|
||||
# https://www.python.org/downloads/
|
||||
#
|
||||
# 3. Append ";C:\Python36;C:\Python36\Scripts" to the "Path" environment variable:
|
||||
# 3. Append ";C:\Python37;C:\Python37\Scripts" to the "Path" environment variable:
|
||||
#
|
||||
# https://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/sysdm_advancd_environmnt_addchange_variable.mspx?mfr=true
|
||||
#
|
||||
|
@ -17,9 +17,9 @@ OPENSSL_VERSION=1.1.1a
|
||||
OPENSSL_URL=https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
|
||||
OPENSSL_SHA1=8fae27b4f34445a5500c9dc50ae66b4d6472ce29
|
||||
|
||||
PYTHON_VERSION=3.6.8
|
||||
PYTHON_VERSION=3.7.2
|
||||
PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
|
||||
PYTHON_SHA1=09fcc4edaef0915b4dedbfb462f1cd15f82d3a6f
|
||||
PYTHON_SHA1=0cd8e52d8ed1d0be12ac8e87a623a15df3a3b418
|
||||
|
||||
#
|
||||
# Install prerequisites.
|
||||
|
@ -24,7 +24,7 @@ fi
|
||||
|
||||
|
||||
BUILD_NUMBER=${BUILD_NUMBER-$USER}
|
||||
PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py27,py36}
|
||||
PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py27,py37}
|
||||
|
||||
for version in $DOCKER_VERSIONS; do
|
||||
>&2 echo "Running tests against Docker $version"
|
||||
|
Loading…
x
Reference in New Issue
Block a user