Commit Graph

3838 Commits

Author SHA1 Message Date
Dan Ryan 6dd068eeb2 Merge branch 'master' into test-fixes 2018-04-10 23:29:14 -04:00
Dan Ryan a10b6e2f12 Merge pull request #1826 from frostming/patch-pep423
Only normalize package names when added to Pipfile
2018-04-10 23:19:58 -04:00
Dan Ryan e36c69723d Merge branch 'test-fixes' of github.com:pypa/pipenv into test-fixes 2018-04-10 21:29:47 -04:00
Dan Ryan 4acf3f3d84 Merge branch 'master' of github.com:pypa/pipenv into test-fixes 2018-04-10 21:26:15 -04:00
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
Dan Ryan acdf71bbc5 Merge branch 'master' into test-fixes 2018-04-09 00:26:33 -04:00
Dan Ryan b5f5acdc4d Revert changes to .travis.yml
- Favor pending changes in #1935

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-08 23:58:43 -04:00
Dan Ryan ce96d0ccfb Skip test stage
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-08 19:54:26 -04:00
Dan Ryan 31c9de2214 Split python2 and python3
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-08 17:47:35 -04: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 5afe66c08c Test fixes?
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-08 11:55:00 -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
Dan Ryan 3b4653d6cc Fix test suites
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-08 11:19:46 -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
Dan Ryan 5bce5f03d1 Fix build stages
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-08 01:36:17 -04: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
Dan Ryan 8d7b15b836 Use different caches for each job
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-07 23:41:26 -04:00
Dan Ryan 0b057c5631 Alter tests for python 3 markers
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-07 23:09:50 -04:00
Dan Ryan a834505799 test speedups
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-07 22:20:16 -04: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
Dan Ryan 50f06289cc Minor test changes
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-07 19:10:21 -04:00