1367ededea
Merge pull request #3190 from pypa/bugfix/3183
...
Fix double completion message on locking
2018-11-08 13:17:07 -05:00
808fd34442
Less checkmarks during lock
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-08 04:49:52 -05:00
a0b8c6d34a
Fix syntax error
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-08 03:52:12 -05:00
3bcbb84052
Merge branch 'master' into bugfix/3183
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-08 03:43:25 -05:00
3bc76bc949
A bit more refactoring and cleanup
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-08 03:41:29 -05:00
494b7f3e9f
Make the PIP_SHIMS_BASE_MODULE pop actually work
2018-11-08 16:17:41 +09:00
5fbfe6a177
Refactor locking
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-08 00:27:11 -05:00
9c02f6ef5f
Update vcs resolution
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 22:16:14 -05:00
59961d6bbb
Move VCS resolution to venv and inside spinner
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 21:54:05 -05:00
b0e5fe12f9
Fix resolver
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 20:20:58 -05:00
e818ca5af6
Fix double completion message on locking
...
- Pass `pre` correctly when using `pipenv install --pre`
- Ensures we always make inline tables when writing to pipfile
- Fixes #3183
- Fixes #3185
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 19:30:14 -05:00
a167885904
Merge pull request #3177 from pypa/implement-tomlkit
...
Implement tomlkit
2018-11-07 17:54:48 -05:00
d52fadc452
Merge branch 'master' into implement-tomlkit
2018-11-07 17:17:31 -05:00
6b13d5a68d
Merge pull request #3176 from frostming/non-ascii-toml
...
Fix non-ASCII support for prettytoml
2018-11-07 17:17:17 -05:00
fde06b3396
Merge branch 'master' into non-ascii-toml
2018-11-07 16:29:54 -05:00
4cb0838fda
Fix tomlkit implementation
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 14:50:33 -05:00
c55fed7845
Merge pull request #3188 from jxltom/only-dev-packages-in-requirementsfile
...
Only output dev packages for pipenv lock -r -d
2018-11-07 11:51:46 -05:00
d851b7ea2d
Fix tomlkit implementation
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 10:39:31 -05:00
991779fdc9
Merge branch 'master' into only-dev-packages-in-requirementsfile
2018-11-07 10:22:11 -05:00
499a43463c
Merge pull request #3172 from jxltom/update-doc-on-skip-lock-option
...
Update skip lock option help info since it is used in several operations
2018-11-07 10:17:20 -05:00
44459b4249
Merge branch 'master' into update-doc-on-skip-lock-option
2018-11-07 10:16:58 -05:00
1cb610981f
Merge branch 'master' into non-ascii-toml
2018-11-07 10:16:11 -05:00
9249ae1b3e
Merge pull request #3186 from pypa/cmdify-quote-command-parens
...
Quote command if it contains parentheses
2018-11-07 10:15:41 -05:00
d52134554e
Only output dev packages for pipenv lock -r -d
2018-11-07 22:42:22 +08:00
ee6d8e6f05
Merge branch 'master' into update-doc-on-skip-lock-option
2018-11-07 20:02:30 +08:00
86a2786954
Quote command if it contains parentheses
...
The command can be safely quoted in this case since non-quotable commands
(cmd built-in) do not have parentheses.
Note that this change only applies to the command, not arguments.
Parentheses in arguments can be correctly interpreted without quotes, and
the quotes, like spaces, will cause incorrect outputs for echo etc.
2018-11-07 20:42:35 +09:00
ca90be95d7
Still not working...
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 00:45:47 -05:00
707cca9693
Merge pull request #3182 from jxltom/no-index-in-requirementsfile-perline
...
Do not add index source per-line in requirements files
2018-11-07 00:45:34 -05:00
31152ea5f5
Merge branch 'master' into non-ascii-toml
2018-11-07 00:43:14 -05:00
005c285dba
Recursively build toml documents when parsing pipfile
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 00:28:05 -05:00
e98c9a4050
Replace ignore instead of skip in skip-lock option's help info
2018-11-07 13:20:13 +08:00
5908e804f1
Update skip lock option help info since it is used in several operations
2018-11-07 13:20:13 +08:00
2f809c2fa3
Fix tomlkit trivia patch
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-07 00:07:33 -05:00
c27abac78c
Merge branch 'master' into no-index-in-requirementsfile-perline
2018-11-06 23:09:04 -05:00
e9e43a8b26
Merge pull request #3171 from jxltom/fix-uninstall-emtpy-virtualenv
...
Do not show error for pipenv uninstall --all in a fresh virtuanlenv
2018-11-06 22:58:48 -05:00
1077acaad4
Merge branch 'master' into fix-uninstall-emtpy-virtualenv
2018-11-06 22:58:38 -05:00
7d51a1fec2
Merge pull request #3175 from jxltom/continue-respect-skip-lock-in-uninstall
...
Continue respect skip lock in uninstall
2018-11-06 22:58:21 -05:00
63d4f9262c
Merge branch 'master' into continue-respect-skip-lock-in-uninstall
2018-11-06 22:58:04 -05:00
6837c6b5d9
Merge pull request #3180 from jxltom/better-output-of-clean-and-uninstall
...
Better output of pipenv clean and uninstall
2018-11-06 22:57:41 -05:00
bd1caee430
Update container patch for comment retention
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-06 22:45:37 -05:00
73243a8f01
Pass decoder to toml.loads
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-06 21:36:50 -05:00
4310bcaf23
remove the tricky lines
2018-11-07 10:06:14 +08:00
4baebe180c
Merge branch 'master' into fix-uninstall-emtpy-virtualenv
2018-11-07 10:00:02 +08:00
85777eb476
Merge branch 'master' into no-index-in-requirementsfile-perline
2018-11-07 09:58:11 +08:00
8bccea4451
Merge branch 'master' into continue-respect-skip-lock-in-uninstall
2018-11-06 20:36:02 -05:00
c47dd0134e
fix patch file
2018-11-07 09:33:39 +08:00
c6db971fed
Merge branch 'master' into better-output-of-clean-and-uninstall
2018-11-06 20:29:11 -05:00
bbf8e3f941
Merge branch 'master' into implement-tomlkit
2018-11-06 20:20:30 -05:00
67334d001f
Fix toml fallback
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-06 20:19:45 -05:00
4610043c64
Update pipfile toml implementation
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-11-06 18:10:21 -05:00
Dan Ryan