Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moto: fix colliding dependencies #65316

Merged
merged 2 commits into from Jul 25, 2019

Conversation

kalbasit
Copy link
Member

@kalbasit kalbasit commented Jul 23, 2019

Motivation for this change

Update jsondiff, and remove the jsondiff binary to prevent collision with jsonpatch effectively breaking the moto package.

closes #65287

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

TODO:

  • Fix the __pycache__/__init__.cpython-37.pyc collision between python3.7-backports.weakref-1.0.post1 and python3.7-backports.tempfile-1.0.
collision between `/nix/store/ns2w9qjcac97iw3j8sn1ygnmcxlhjgw8-python3.7-backports.weakref-1.0.post1/lib/python3.7/site-packages/backports/__pycache__/__init__.cpython-37.pyc' and `/nix/store/0v89qm932fmifhib68nlimwzlzr6bnyq-python3.7-backports.tempfile-1.0/lib/python3.7/site-packages/backports/__pycache__/__init__.cpython-37.pyc'

@kalbasit kalbasit requested a review from FRidh July 23, 2019 21:19
@kalbasit kalbasit changed the title Nixpkgs fix moto collision moto: fix colliding dependencies Jul 23, 2019
@kalbasit
Copy link
Member Author

This is now working with Python3

 λ  nix-shell --show-trace -E '(with import ./. {}; (python3.withPackages(ps: [ ps.moto ])).env)' --run 'python -c "import moto; print(moto)"'
<module 'moto' from '/nix/store/y2kcp67fhlv0nk9gqxp799qqjmdrfhmf-python3-3.7.4-env/lib/python3.7/site-packages/moto/__init__.py'>

It's still broken for Python2

 λ  nix-shell --show-trace -E '(with import ./. {}; (python2.withPackages(ps: [ ps.moto ])).env)' --run 'python -c "import moto; print(moto)"'
these derivations will be built:
  /nix/store/cg7h5v4sbk88vqrf6lxi3zyf1qivngg7-python-2.7.16-env.drv
building '/nix/store/cg7h5v4sbk88vqrf6lxi3zyf1qivngg7-python-2.7.16-env.drv'...
collision between `/nix/store/0gjgi8l71ygbsp4gjxcnkr3bn4hlmq5k-python2.7-backports.ssl_match_hostname-3.7.0.1/lib/python2.7/site-packages/backports/__init__.py' and `/nix/store/4r37bkp7ply9vvggpxs3lspfa91djk3y-python2.7-backports.tempfile-1.0/lib/python2.7/site-packages/backports/__init__.py'
builder for '/nix/store/cg7h5v4sbk88vqrf6lxi3zyf1qivngg7-python-2.7.16-env.drv' failed with exit code 25
error: build of '/nix/store/cg7h5v4sbk88vqrf6lxi3zyf1qivngg7-python-2.7.16-env.drv' failed

@FRidh
Copy link
Member

FRidh commented Jul 24, 2019

Please rebase. I merged #65318.

pythonPackages.jsonpatch also creates bin/jsondiff, and packages
depending on both are not usable.
@kalbasit kalbasit force-pushed the nixpkgs_fix-moto-collision branch 2 times, most recently from 253a517 to d99c6cc Compare July 25, 2019 05:42
@kalbasit
Copy link
Member Author

@GrahamcOfBorg build python3Packages.jsondiff python3Packages.moto

@kalbasit kalbasit merged commit 6b89e87 into NixOS:master Jul 25, 2019
@kalbasit kalbasit deleted the nixpkgs_fix-moto-collision branch July 25, 2019 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

python3Packages.moto's dependencies collide with each other
2 participants