Commit Graph

3821 Commits

Author SHA1 Message Date
Dan Ryan ba2f781acd Merge branch 'master' into patch-pep423 2018-04-10 21:16:14 -04:00
Dan Ryan 8db025cada Merge pull request #1949 from pypa/doc-update-git
Update vcs documentation
2018-04-10 21:07:36 -04:00
Dan Ryan c0bff43a70 Merge branch 'master' into doc-update-git 2018-04-10 21:07:28 -04:00
Dan Ryan 74c0df21f2 Merge pull request #1943 from pypa/bugfix/1002-refix
Fix allow_global=system with new resolver
2018-04-10 21:07:04 -04:00
Dan Ryan c84e60cdaa Update vcs documentation
- Add link to pip docs
- Unquote `-e .` example
- Add detail to examples
- Closes #1908

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-10 19:27:30 -04:00
Dan Ryan 1fd34fbe5c Merge branch 'master' of github.com:pypa/pipenv into bugfix/1002-refix
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-10 13:19:42 -04:00
Frost Ming b9bd4835ee Improve according to comments 2018-04-10 20:39:51 +08:00
frostming d82b1faf93 revert the change 2018-04-10 19:47:44 +08:00
frostming 3c0770fb7a Fix tests failures 2018-04-10 19:47:44 +08:00
frostming 29e9b237ae fix iteration 2018-04-10 19:47:44 +08:00
frostming 4b290407d3 only change things on way in 2018-04-10 19:47:44 +08:00
frostming fc17c757de test preserve comments 2018-04-10 19:47:44 +08:00
frostming e2e2ac1ee1 Fix an error that was never hit 2018-04-10 19:47:44 +08:00
Frost Ming cd28874469 add tests
fix the broken `items()`

Fix test cases

Keep contoml untouched
2018-04-10 19:47:44 +08:00
Frost Ming f29aedc65c fix reference losing for _pipfile 2018-04-10 19:47:44 +08:00
Dan Ryan 58ba223448 Merge pull request #1941 from pypa/history
Update history
2018-04-10 00:24:17 -04:00
Dan Ryan 5af3f98ef8 Merge branch 'master' into history 2018-04-10 00:24:01 -04:00
Dan Ryan 238860d872 Fixes #1002, #1939
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-09 16:18:04 -04:00
Dan Ryan 66702c6347 Merge pull request #1935 from tsiq-oliverc/dedupe-marker-lists-in-ci
Simplify CI test orchestration
2018-04-09 12:15:56 -04:00
Tzu-ping Chung 00384749a4 Update history 2018-04-09 22:10:07 +08:00
Oliver Charlesworth d23b91742f Merge branch 'master' into dedupe-marker-lists-in-ci 2018-04-09 08:43:21 +01:00
Oliver Charlesworth 983fefdc4c Replace build stages with matrix 2018-04-09 08:28:36 +01:00
Oliver Charlesworth 6f6539b101 Fix things 2018-04-08 17:27:58 +01:00
Dan Ryan ea0abf4536 Merge pull request #1927 from altendky/1910-try_harder_to_cleanup_virtualenv
Use util.rmtree() in cleanup_virtualenv()
2018-04-08 11:56:05 -04:00
Dan Ryan b90e3d7d45 Merge branch 'master' into 1910-try_harder_to_cleanup_virtualenv 2018-04-08 11:55:53 -04:00
Dan Ryan 5e1d05f9bb Merge pull request #1916 from pypa/version-parse-fix
Fix Python version parser for 2.7.0
2018-04-08 11:53:06 -04:00
Kyle Altendorf 24405285af Merge branch 'master' into 1910-try_harder_to_cleanup_virtualenv 2018-04-08 07:59:49 -07:00
Tzu-ping Chung e46cabcb2c Fix Python version parser for 2.7.0
Fix #1893.
2018-04-08 17:23:17 +08:00
Tzu-ping Chung 7920e9cf5c Merge pull request #1930 from pypa/dotenv-upgrade
Dotenv upgrade
2018-04-08 17:21:58 +08:00
Tzu-ping Chung ce584f0713 Move dotenv back to vendor and add README 2018-04-08 11:52:14 +08:00
Tzu-ping Chung b653017168 Update python-dotenv to 0.8.2 2018-04-08 11:52:14 +08:00
Kyle Altendorf 033146ac2c Merge branch 'master' into 1910-try_harder_to_cleanup_virtualenv 2018-04-07 17:50:07 -07:00
Oliver Charlesworth ed416e537a Simplify appveyor.yml 2018-04-08 00:31:14 +01:00
Oliver Charlesworth 57a0058e9a Fix whitespace 2018-04-08 00:26:38 +01:00
Oliver Charlesworth e963674e66 Remove CI stuff from run-tests.sh 2018-04-08 00:17:49 +01:00
Oliver Charlesworth 5626e71506 Disable cli tests for py2 2018-04-08 00:09:11 +01:00
Oliver Charlesworth 571859fded Simplify further 2018-04-07 23:57:33 +01:00
Oliver Charlesworth d523726264 See what happens if we only run with one TEST_SUITE 2018-04-07 23:38:29 +01:00
Oliver Charlesworth e3f71ccaed Don't run cli tests twice 2018-04-07 23:24:44 +01:00
Oliver Charlesworth ef2fb0aaa4 Decouple from run-tests.sh 2018-04-07 23:13:06 +01:00
Oliver Charlesworth b9cd7c2a5e Remove more stuff from run_tests.sh 2018-04-07 23:06:12 +01:00
Oliver Charlesworth 3e754c52ee Clean up run-tests.sh 2018-04-07 22:14:15 +01:00
Dan Ryan 6828dbc69e Merge pull request #1922 from techalchemy/rebase-master
Fix tests and scripts
2018-04-07 16:54:13 -04:00
Tzu-ping Chung bc776e4f7b Maybe delete cache on Travis? 2018-04-08 00:40:58 +08:00
Tzu-ping Chung fd922dae33 Quote wars 2018-04-07 23:57:01 +08:00
Tzu-ping Chung 7b3d191a4a Merge sections 2018-04-07 22:33:18 +08:00
Tzu-ping Chung c054d2ae94 Skip test_complex_lock_deep_extras 2018-04-07 22:13:33 +08:00
Tzu-ping Chung f2bfc96baf Come on 2018-04-07 21:42:36 +08:00
Tzu-ping Chung bef4c72ca4 Don't need to run cli twice on Appveyor 2018-04-07 21:31:45 +08:00
Tzu-ping Chung bc40d76cf0 Try to fix the Appveyor run script 2018-04-07 21:26:54 +08:00