mirror of https://github.com/docker/docker-py.git
deps: test on Python 3.10 by default (#3010)
* Upgrade to latest Sphinx / recommonmark * Small CSS fix for issue in new version of Alabaster theme * Fix `Makefile` target for macOS Signed-off-by: Milas Bowman <milas.bowman@docker.com>
This commit is contained in:
parent
0ee9f260e4
commit
da62a28837
|
@ -3,8 +3,12 @@ version: 2
|
||||||
sphinx:
|
sphinx:
|
||||||
configuration: docs/conf.py
|
configuration: docs/conf.py
|
||||||
|
|
||||||
|
build:
|
||||||
|
os: ubuntu-20.04
|
||||||
|
tools:
|
||||||
|
python: '3.10'
|
||||||
|
|
||||||
python:
|
python:
|
||||||
version: 3.6
|
|
||||||
install:
|
install:
|
||||||
- requirements: docs-requirements.txt
|
- requirements: docs-requirements.txt
|
||||||
- requirements: requirements.txt
|
- requirements: requirements.txt
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG PYTHON_VERSION=3.7
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG PYTHON_VERSION=3.7
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ def buildImages = { ->
|
||||||
imageDindSSH = "${imageNameBase}:sshdind-${gitCommit()}"
|
imageDindSSH = "${imageNameBase}:sshdind-${gitCommit()}"
|
||||||
withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
|
withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
|
||||||
buildImage(imageDindSSH, "-f tests/Dockerfile-ssh-dind .", "")
|
buildImage(imageDindSSH, "-f tests/Dockerfile-ssh-dind .", "")
|
||||||
buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.7 .", "py3.7")
|
buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.10 .", "py3.10")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ def runTests = { Map settings ->
|
||||||
throw new Exception("Need Docker version to test, e.g.: `runTests(dockerVersion: '19.03.12')`")
|
throw new Exception("Need Docker version to test, e.g.: `runTests(dockerVersion: '19.03.12')`")
|
||||||
}
|
}
|
||||||
if (!pythonVersion) {
|
if (!pythonVersion) {
|
||||||
throw new Exception("Need Python version being tested, e.g.: `runTests(pythonVersion: 'py3.7')`")
|
throw new Exception("Need Python version being tested, e.g.: `runTests(pythonVersion: 'py3.x')`")
|
||||||
}
|
}
|
||||||
|
|
||||||
{ ->
|
{ ->
|
||||||
|
|
12
Makefile
12
Makefile
|
@ -1,6 +1,16 @@
|
||||||
TEST_API_VERSION ?= 1.41
|
TEST_API_VERSION ?= 1.41
|
||||||
TEST_ENGINE_VERSION ?= 20.10
|
TEST_ENGINE_VERSION ?= 20.10
|
||||||
|
|
||||||
|
ifeq ($(OS),Windows_NT)
|
||||||
|
PLATFORM := Windows
|
||||||
|
else
|
||||||
|
PLATFORM := $(shell sh -c 'uname -s 2>/dev/null || echo Unknown')
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(PLATFORM),Linux)
|
||||||
|
uid_args := "--build-arg uid=$(shell id -u) --build-arg gid=$(shell id -g)"
|
||||||
|
endif
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: test
|
all: test
|
||||||
|
|
||||||
|
@ -19,7 +29,7 @@ build-py3:
|
||||||
|
|
||||||
.PHONY: build-docs
|
.PHONY: build-docs
|
||||||
build-docs:
|
build-docs:
|
||||||
docker build -t docker-sdk-python-docs -f Dockerfile-docs --build-arg uid=$(shell id -u) --build-arg gid=$(shell id -g) .
|
docker build -t docker-sdk-python-docs -f Dockerfile-docs $(uid_args) .
|
||||||
|
|
||||||
.PHONY: build-dind-certs
|
.PHONY: build-dind-certs
|
||||||
build-dind-certs:
|
build-dind-certs:
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
recommonmark==0.4.0
|
recommonmark==0.7.1
|
||||||
Sphinx==1.4.6
|
Sphinx==5.1.1
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
dl.hide-signature > dt {
|
dl.hide-signature > dt {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dl.field-list > dt {
|
||||||
|
/* prevent code blocks from forcing wrapping on the "Parameters" header */
|
||||||
|
word-break: initial;
|
||||||
|
}
|
||||||
|
|
3
setup.py
3
setup.py
|
@ -62,7 +62,7 @@ setup(
|
||||||
install_requires=requirements,
|
install_requires=requirements,
|
||||||
tests_require=test_requirements,
|
tests_require=test_requirements,
|
||||||
extras_require=extras_require,
|
extras_require=extras_require,
|
||||||
python_requires='>=3.6',
|
python_requires='>=3.7',
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
test_suite='tests',
|
test_suite='tests',
|
||||||
classifiers=[
|
classifiers=[
|
||||||
|
@ -72,7 +72,6 @@ setup(
|
||||||
'Operating System :: OS Independent',
|
'Operating System :: OS Independent',
|
||||||
'Programming Language :: Python',
|
'Programming Language :: Python',
|
||||||
'Programming Language :: Python :: 3',
|
'Programming Language :: Python :: 3',
|
||||||
'Programming Language :: Python :: 3.6',
|
|
||||||
'Programming Language :: Python :: 3.7',
|
'Programming Language :: Python :: 3.7',
|
||||||
'Programming Language :: Python :: 3.8',
|
'Programming Language :: Python :: 3.8',
|
||||||
'Programming Language :: Python :: 3.9',
|
'Programming Language :: Python :: 3.9',
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG PYTHON_VERSION=3.7
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG PYTHON_VERSION=3.6
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
RUN mkdir /tmp/certs
|
RUN mkdir /tmp/certs
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG API_VERSION=1.39
|
ARG API_VERSION=1.41
|
||||||
ARG ENGINE_VERSION=19.03.12
|
ARG ENGINE_VERSION=20.10.17
|
||||||
|
|
||||||
FROM docker:${ENGINE_VERSION}-dind
|
FROM docker:${ENGINE_VERSION}-dind
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue