Skip to content

Conversation

@albertyw
Copy link
Contributor

@albertyw albertyw commented Dec 3, 2019

Jenkins is complaining about

Traceback (most recent call last):
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/req/req_install.py", line 339, in check_if_exists
    self.satisfied_by = pkg_resources.get_distribution(str(no_marker))
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 476, in get_distribution
    dist = get_provider(dist)
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 352, in get_provider
    return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 895, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 786, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pip._vendor.pkg_resources.ContextualVersionConflict: (six 1.13.0 (/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages), Requirement.parse('six==1.12.0'), {'django-compressor'})
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/cli/base_command.py", line 143, in main
    status = self.run(options, args)
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/commands/install.py", line 318, in run
    resolver.resolve(requirement_set)
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/resolve.py", line 102, in resolve
    self._resolve_one(requirement_set, req)
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/resolve.py", line 256, in _resolve_one
    abstract_dist = self._get_abstract_dist_for(req_to_install)
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/resolve.py", line 193, in _get_abstract_dist_for
    req, self.require_hashes, self.use_user_site, self.finder,
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/operations/prepare.py", line 329, in prepare_editable_requirement
    req.check_if_exists(use_user_site)
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_internal/req/req_install.py", line 350, in check_if_exists
    self.req.name
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 476, in get_distribution
    dist = get_provider(dist)
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 352, in get_provider
    return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 895, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py", line 786, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pip._vendor.pkg_resources.ContextualVersionConflict: (six 1.13.0 (/home/travis/build/django-compressor/django-compressor/.tox/py37-1.11.X/lib/python3.7/site-packages), Requirement.parse('six==1.12.0'), {'django-compressor'})

Followed pypa/pip#4537 (comment) to fix tests

@diox
Copy link
Member

diox commented Dec 3, 2019

Since we're dropping Python 3 compatibility in #965, we should probably remove the dependency on six altogether. Would you be willing to do that ? Otherwise I'll take care of it later this week-end.

@albertyw
Copy link
Contributor Author

albertyw commented Dec 3, 2019

Given that the build is broken, I think it would be cleaner to merge this simple fix as-is, before anything else, then drop six after the v2.4 release. See also my comment in #964 (comment)

@diox
Copy link
Member

diox commented Dec 3, 2019

That's fair. Let's merge this to fix tests first, now that I've read the issue and understood the workaround it seems fine.

@diox diox merged commit d8edbd3 into django-compressor:develop Dec 3, 2019
@albertyw albertyw deleted the fix-tests branch December 4, 2019 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants