Commit Graph

3734 Commits

Author SHA1 Message Date
Dan Ryan 4551d2b68c Fix verbose command construction 2018-03-30 16:36:19 -04:00
Dan Ryan f61a2eddca Fix resolution for broken tests
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-30 15:49:12 -04:00
Dan Ryan f13f296b03 Fix tests
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-30 14:52:13 -04:00
Dan Ryan d36081889e Remove mocked pypi from complex test
- Remove extra marker too

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-30 13:44:49 -04:00
Dan Ryan 4117affaef Catch up with master properly
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-30 13:10:24 -04:00
Dan Ryan 5f1d8ee309 Final test updates 2018-03-30 13:00:59 -04:00
Tzu-ping Chung 6bde082a04 Skip some tests on 2.7 2018-03-30 12:38:11 -04:00
Dan Ryan 3e07c809eb Undo capsys, reorder install and lock 2018-03-30 12:37:17 -04:00
Dan Ryan 28a6cb4805 Disable capsys to capture stdout/stderr 2018-03-30 12:37:17 -04:00
Dan Ryan a4bbed3f69 Block for debugging 2018-03-30 12:37:16 -04:00
Tzu-ping Chung b5ae7cc0bb Just always require suffix then
This is not the TemporaryDirectory you are looking for.
2018-03-30 12:37:16 -04:00
Tzu-ping Chung ba93ad2da5 Never mock PyPI half-way, either do, or don't 2018-03-30 12:37:16 -04:00
Tzu-ping Chung 42d83dbbac Need to use the backported TemporaryDirectory 2018-03-30 12:37:15 -04:00
Tzu-ping Chung 6cd545b8c6 Monkey-patch pipfile.api to use the mocked index 2018-03-30 12:37:15 -04:00
Tzu-ping Chung 1c9792434d Un-mock maya 2018-03-30 12:37:15 -04:00
Tzu-ping Chung a3dcc66844 Refactor 2018-03-30 12:37:13 -04:00
Tzu-ping Chung 67de4891a9 Skip Internet and add verbose flag if possible 2018-03-30 12:36:37 -04:00
Tzu-ping Chung 8a39fbceaa Actually use mocked PyPI when testing with locking 2018-03-30 12:36:34 -04:00
Tzu-ping Chung 0cb0f8999f Fix scripts and source errors not caught before 2018-03-30 12:32:07 -04:00
Tzu-ping Chung fa424989f3 Fix ConTOML's __str__ on Python 3 2018-03-30 12:30:22 -04:00
Dan Ryan 8f0af53fb5 Merge pull request #1865 from frostming/pass-pre-flag
Pass allow_prereleases setting to lock
2018-03-30 12:28:06 -04:00
Frost Ming 786929b0bf remove redundant lines 2018-03-30 22:35:48 +08:00
Frost Ming aff9078985 pass pre flag to lock 2018-03-30 22:35:48 +08:00
Dan Ryan 979577d971 Merge pull request #1870 from gsemet/gitignore
ignore .tox folder
2018-03-30 09:58:59 -04:00
Dan Ryan 8cc4a45bc2 Merge pull request #1878 from svanburen/patch-2
Update advanced.rst
2018-03-30 09:49:47 -04:00
Dan Ryan 060a1d652c Merge branch 'master' into patch-2 2018-03-30 09:48:50 -04:00
Dan Ryan 7a861c4a2c Merge pull request #1854 from pypa/locking-handle-eggs
Ensure locking works with eggs
2018-03-30 00:59:46 -04:00
Dan Ryan 00ebba4b58 Switch to tablib and try again
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-29 22:00:44 -04:00
Dan Ryan 0af19190d1 Bugfix
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-29 21:26:42 -04:00
Dan Ryan a62ec1c40a HISTORY.txt update 2018-03-29 21:15:30 -04:00
Dan Ryan 4043ee57f6 Merge branch 'jtratner/fix-scripts-quoting' into locking-handle-eggs 2018-03-29 21:12:13 -04:00
Jeff Tratner e4a5b2caf6 Simplify 2018-03-29 17:59:34 -07:00
Jeff Tratner 15c19ee001 Make run easier to understand 2018-03-29 17:57:04 -07:00
Dan Ryan 15bb50cfa4 Add some markers
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-29 20:43:27 -04:00
Dan Ryan 94af245f6d Always use posix=False to avoid dropping quotes
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-29 20:08:56 -04:00
Stefan VanBuren 939d77cf40 Update advanced.rst
Needs an extra `:` to render the .rst properly
2018-03-29 11:31:30 -04:00
Dan Ryan 139d8bd553 Merge branch 'master' into locking-handle-eggs 2018-03-29 09:32:20 -04:00
Jeff Tratner 133417a941 Remove extraneous is_vcs calls
1. is_vcs requires (req.path or req.uri) to be truthy.
2. (req.path or req.uri) would be true in first if statement

Thus if you have:

```
if (req.uri or req.path or ...) and not req.vcs
elif req.vcs or is_vcs(req.path)
```

if `is_vcs(req.path)` is Truthy, then the first if clause must be
truthy, so it's unnecessary.

Also add a quick test to confirm that originating purpose for that check
is now handled otherwise.
2018-03-29 09:32:04 -04:00
Jeff Tratner 5de48b4800 Better shell quoting
1. Only use split() when we actually come in from CLI (possibly never
   need to do that at all)
2. Add some additional test cases to cover quoting.
3. Better error message in case of missing executable pulled from a run
script.

E.g.:

```
[scripts]
random = "myexecutable a b c"
myexecutable = "echo 5"
```

```
Error: the command myexecutable (from random) could not be found within PATH.
```

vs. previous, which had a slightly disingenous error message.

```
Error: the command myexecutable could not be found within PATH or Pipfile's [scripts].
```
2018-03-29 00:55:08 -07:00
Jeff Tratner 7afa528c0f Fix small test case typo 2018-03-28 23:54:00 -07:00
Dan Ryan 71896d1f20 Skip python 3 only test on py2
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-29 00:48:01 -04:00
Dan Ryan 14cdff2c0b Include markers when they are included at top lvl
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-29 00:13:20 -04:00
Dan Ryan 4a425c3429 Add regression tests for resolver changes
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-03-28 23:00:38 -04:00
Dan Ryan 66e3f556fc Exclude markers from top level dependencies 2018-03-28 21:48:49 -04:00
Dan Ryan 319c0b3d65 Always include markers when resolving 2018-03-28 21:38:14 -04:00
Dan Ryan d28ec00678 Clean up resolver marker deduplication 2018-03-28 20:36:28 -04:00
Dan Ryan bc61441922 Skip unsupported extensions
- Always skip unsupported extensions (like .egg) even when
  passing `ignore_compatibility=True`
2018-03-28 18:55:15 -04:00
Dan Ryan 7697541dc0 Merge branch 'master' into locking-handle-eggs 2018-03-28 18:00:01 -04:00
Gaetan Semet 7c4f09e812 ignore .tox folder 2018-03-28 21:48:04 +02:00
Jeff Tratner b0445a2c0b Lint fixes
Fix up tests a little more

Use temp_environ rather than monkeypatch
2018-03-27 15:30:22 -04:00