diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2019-10-02 17:54:48 +0200 |
|---|---|---|
| committer | Andrew Hsu <andrewhsu@docker.com> | 2019-10-02 17:42:41 +0000 |
| commit | ec0e20a9eba5e37c6e85c5e5d288033f363ee660 (patch) | |
| tree | 4004c6882e63ade82f64d570adf00fa6c11f3e0b | |
| parent | 060997ca6be2fb41344237842e66d16ef4cc67e3 (diff) | |
| download | docker-ec0e20a9eba5e37c6e85c5e5d288033f363ee660.tar.gz | |
Temporarily switch docker-py to "master"
The docker-py tests were broken, because the version of
py-test that was used, used a dependency that had a new
major release with a breaking change.
Unfortunately, it was not pinned to a specific version,
so when the dependency did the release, py-test broke;
```
22:16:47 Traceback (most recent call last):
22:16:47 File "/usr/local/bin/pytest", line 10, in <module>
22:16:47 sys.exit(main())
22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 61, in main
22:16:47 config = _prepareconfig(args, plugins)
22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 182, in _prepareconfig
22:16:47 config = get_config()
22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 156, in get_config
22:16:47 pluginmanager.import_plugin(spec)
22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 530, in import_plugin
22:16:47 __import__(importspec)
22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 25, in <module>
22:16:47 class TempPathFactory(object):
22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 35, in TempPathFactory
22:16:47 lambda p: Path(os.path.abspath(six.text_type(p)))
22:16:47 TypeError: attrib() got an unexpected keyword argument 'convert'
```
docker-py master has a fix for this (bumping the version of
`py-test`), but it's not in a release yet, and the docker cli that's used
in our CI is pinned to 17.06, which doesn't support building from a remote
git repository from a specific git commit.
To fix the immediate situation, this patch switches the docker-py
tests to run from the master branch.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 48353e16fe4bc06764ceb6bced0fbe832803ede4)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
| -rw-r--r-- | hack/make/test-docker-py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hack/make/test-docker-py b/hack/make/test-docker-py index da51928e9d..fdd4566011 100644 --- a/hack/make/test-docker-py +++ b/hack/make/test-docker-py @@ -7,7 +7,7 @@ source hack/make/.integration-test-helpers # TODO docker 17.06 cli client used in CI fails to build using a sha; # unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: error: no such remote ref ead0bb9e08c13dd3d1712759491eee06bf5a5602 #: exit status 128 -: "${DOCKER_PY_COMMIT:=4.0.2}" +: "${DOCKER_PY_COMMIT:=master}" # custom options to pass py.test # TODO remove these skip once we update to a docker-py version that has https://github.com/docker/docker-py/pull/2369, https://github.com/docker/docker-py/pull/2380, https://github.com/docker/docker-py/pull/2382 |