Bump pytest to 4.3.1 by kolyshkin · Pull Request #2441 · docker/docker-py

kolyshkin · 2019-10-02T00:32:22Z

Pytest 4.3.1 includes the fix from pytest-dev/pytest#4795

which should fix the following failure:

INFO: Building docker-sdk-python3:4.0.2...
sha256:c7a40413c985b6e75df324fae39b1c30cb78a25df71b7892f1a4a15449537fb3
INFO: Starting docker-py tests...
Traceback (most recent call last):
File "/usr/local/bin/pytest", line 10, in
sys.exit(main())
File "/usr/local/lib/python3.6/site-packages/_pytest/config/init.py", line 61, in main
config = _prepareconfig(args, plugins)
File "/usr/local/lib/python3.6/site-packages/_pytest/config/init.py", line 182, in _prepareconfig
config = get_config()
File "/usr/local/lib/python3.6/site-packages/_pytest/config/init.py", line 156, in get_config
pluginmanager.import_plugin(spec)
File "/usr/local/lib/python3.6/site-packages/_pytest/config/init.py", line 530, in import_plugin
import(importspec)
File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 25, in
class TempPathFactory(object):
File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 35, in TempPathFactory
lambda p: Path(os.path.abspath(six.text_type(p)))
TypeError: attrib() got an unexpected keyword argument 'convert'
Sending interrupt signal to process
Terminated
script returned exit code 143

Signed-off-by: Kir Kolyshkin kolyshkin@gmail.com

Pytest 4.3.1 includes the fix from pytest-dev/pytest#4795 which should fix the following failure: > INFO: Building docker-sdk-python3:4.0.2... > sha256:c7a40413c985b6e75df324fae39b1c30cb78a25df71b7892f1a4a15449537fb3 > INFO: Starting docker-py tests... > Traceback (most recent call last): > File "/usr/local/bin/pytest", line 10, in <module> > sys.exit(main()) > File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 61, in main > config = _prepareconfig(args, plugins) > File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 182, in _prepareconfig > config = get_config() > File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 156, in get_config > pluginmanager.import_plugin(spec) > File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 530, in import_plugin > __import__(importspec) > File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 25, in <module> > class TempPathFactory(object): > File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 35, in TempPathFactory > lambda p: Path(os.path.abspath(six.text_type(p))) > TypeError: attrib() got an unexpected keyword argument 'convert' > Sending interrupt signal to process > Terminated > script returned exit code 143 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

kolyshkin · 2019-10-02T00:58:49Z

This should fix make test-docker-py in moby/moby master. Steps to repro:

git clone https://github.com/moby/moby && cd moby && make test-docker-py

Result:

...
Starting dockerd
.
INFO: Building docker-sdk-python3:4.0.2...
sha256:5b2a11356e6f6a1bc78568cde08d47132fa81805d86cc955a8435a96d6d188bb
INFO: Starting docker-py tests...
Traceback (most recent call last):
  File "/usr/local/bin/pytest", line 10, in <module>
    sys.exit(main())
  File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 61, in main
    config = _prepareconfig(args, plugins)
  File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 182, in _prepareconfig
    config = get_config()
  File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 156, in get_config
    pluginmanager.import_plugin(spec)
  File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 530, in import_plugin
    __import__(importspec)
  File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 25, in <module>
    class TempPathFactory(object):
  File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 35, in TempPathFactory
    lambda p: Path(os.path.abspath(six.text_type(p)))
TypeError: attrib() got an unexpected keyword argument 'convert'

kolyshkin · 2019-10-02T00:59:03Z

@shin- PTAL

thaJeztah · 2019-10-02T10:49:39Z

Failure looks to be unrelated; https://ci.docker.com/public/blue/rest/organizations/jenkins/pipelines/docker-py/branches/PR-2441/runs/1/nodes/68/log/?start=0


=================================== FAILURES ===================================
______________________ PruneImagesTest.test_prune_images _______________________
tests/integration/api_image_test.py:327: in test_prune_images
    img_id = self.client.inspect_image('hello-world')['Id']
docker/utils/decorators.py:19: in wrapped
    return f(self, resource_id, *args, **kwargs)
docker/api/image.py:246: in inspect_image
    self._get(self._url("/images/{0}/json", image)), True
docker/api/client.py:267: in _result
    self._raise_for_status(response)
docker/api/client.py:263: in _raise_for_status
    raise create_api_error_from_http_exception(e)
docker/errors.py:31: in create_api_error_from_http_exception
    raise cls(e, response=response, explanation=explanation)
E   ImageNotFound: 404 Client Error: Not Found ("no such image: hello-world: No such image: hello-world:latest")

thaJeztah · 2019-10-02T10:50:07Z

I wonder if py-test should pin its dependencies to major versions, as this clearly broke older versions of py-test?

thaJeztah · 2019-10-02T10:59:09Z

@chris-crone @ulyssessouza PTAL

ulyssessouza

LGTM

kolyshkin · 2019-10-02T16:10:21Z

I wonder if py-test should pin its dependencies to major versions, as this clearly broke older versions of py-test?

Ideally, yes, they should, although in this case once it's broken it's too late

kolyshkin · 2019-10-02T20:17:18Z

@ulyssessouza @rumpl @shin- is it possible to prepare/tag a release containing this PR?

shin- · 2019-10-02T21:44:17Z

@kolyshkin I'm going to be offline for a couple of weeks starting tomorrow, so if @ulyssessouza or @rumpl can take the lead on that that'd be ideal! Thanks guys :)

thaJeztah · 2019-10-02T22:01:28Z

@shin- I see there's one (unresolved) issue on the 4.1.0 milestone; #2355 - is that a blocker for 4.1.0, or was it just put on the milestone "tentatively" ?

To check what the next tag should be (4.1.0 or 4.0.3); looking through the changes, most changes are fixes;

diff 4.0.2...master (may be deceiving, as we're comparing between branches, and some commits may not match)
raw diff: https://github.com/docker/docker-py/compare/4.0.2..master

I think (may want to double-check) that #2333 is the only feature that was added; if that's indeed a feature, then it should be 4.1.0

@ulyssessouza @shin- ^^

shin- · 2019-10-02T22:18:38Z

@shin- I see there's one (unresolved) issue on the 4.1.0 milestone; #2355 - is that a blocker for 4.1.0, or was it just put on the milestone "tentatively" ?

Not a blocker, more of a wish 😅

To check what the next tag should be (4.1.0 or 4.0.3); looking through the changes, most changes are fixes;

diff 4.0.2...master (may be deceiving, as we're comparing between branches, and some commits may not match)

raw diff: https://github.com/docker/docker-py/compare/4.0.2..master

I think (may want to double-check) that #2333 is the only feature that was added; if that's indeed a feature, then it should be 4.1.0

@ulyssessouza @shin- ^^

I'd go ahead and release 4.1.0 without #2355 (which we can move into the next milestone)

thaJeztah · 2019-10-02T23:42:28Z

Thanks! Looks like we have a way forward 👍

chris-crone · 2019-10-03T13:46:17Z

@kolyshkin @thaJeztah We'll do a release ASAP.

chris-crone · 2019-10-03T14:42:45Z

Release is up

thaJeztah · 2019-10-03T14:49:39Z

awesome, thanks!

thaJeztah · 2019-10-03T14:53:00Z

PR opened in moby; moby/moby#40034

kolyshkin · 2019-10-03T17:11:09Z

Awesome, thank you everyone! 🤗

ulyssessouza approved these changes Oct 2, 2019

View reviewed changes

ulyssessouza merged commit 8077d80 into docker:master Oct 2, 2019

thaJeztah mentioned this pull request Oct 2, 2019

Temporarily switch docker-py to "master" moby/moby#40030

Merged

chris-crone added this to the 4.1.0 milestone Oct 3, 2019

Conversation

kolyshkin commented Oct 2, 2019

Uh oh!

kolyshkin commented Oct 2, 2019

Uh oh!

kolyshkin commented Oct 2, 2019

Uh oh!

thaJeztah commented Oct 2, 2019

Uh oh!

thaJeztah commented Oct 2, 2019

Uh oh!

thaJeztah commented Oct 2, 2019

Uh oh!

ulyssessouza left a comment

Choose a reason for hiding this comment

Uh oh!

kolyshkin commented Oct 2, 2019

Uh oh!

kolyshkin commented Oct 2, 2019

Uh oh!

shin- commented Oct 2, 2019

Uh oh!

thaJeztah commented Oct 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shin- commented Oct 2, 2019

Uh oh!

thaJeztah commented Oct 2, 2019

Uh oh!

chris-crone commented Oct 3, 2019

Uh oh!

chris-crone commented Oct 3, 2019

Uh oh!

thaJeztah commented Oct 3, 2019

Uh oh!

thaJeztah commented Oct 3, 2019

Uh oh!

kolyshkin commented Oct 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

thaJeztah commented Oct 2, 2019 •

edited

Loading