Yelp / venv-update

LAST BUILD ON BRANCH master

branch: master

CHANGE BRANCH

x

Reset

• master
• argument-test
• bsd-touch
• buck-integrate-wip
• buck-testing
• cant-pre-commit
• conflict-error-message
• conflict-is-an-error
• drop-pypy
• eggless-urls
• exec-again
• faster-find-reqs
• instrument-install.2
• master.2
• no-argparse
• no-capfd
• no-deps
• no-plumbum
• no-scenarios
• optimize-pinned.2
• pin_argparse_less_meybs
• pip_faster_package
• plus-wheel
• random-ci-improvements
• relocatable-again
• requirements.py
• requirements_py
• resolve-todos
• revert-48-pin_argparse_less_meybs
• two-stage
• unit-coverage
• v0.1
• v0.1.1
• venv-args
• wrong_wheel

fix conflict_test (there's one less error now)