64a12a1004
Merge branch 'master' into patch-2
2018-03-30 19:11:34 -04:00
2590faa9a8
Merge pull request #1877 from remram44/mention-pipenv-ignore-virtualenvs
...
Mention PIPENV_IGNORE_VIRTUALENVS in help message
2018-03-30 19:11:19 -04:00
7b15a79fd8
Merge branch 'master' into mention-pipenv-ignore-virtualenvs
2018-03-30 19:10:56 -04:00
980cfe0827
Merge pull request #1857 from pypa/operation-fix-tests
...
Operation Fix Tests
2018-03-30 19:10:39 -04:00
ff15be72c5
Remove verbose flag auto-add
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-30 18:27:25 -04:00
f9ce022794
Tweeak pypi mock
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-30 18:25:42 -04:00
61ce755229
Add missing artifacts
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-30 18:15:44 -04:00
5d3bb0768d
Unmock ibm-db-sa
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-30 17:54:52 -04:00
4551d2b68c
Fix verbose command construction
2018-03-30 16:36:19 -04:00
f61a2eddca
Fix resolution for broken tests
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-30 15:49:12 -04:00
f13f296b03
Fix tests
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-30 14:52:13 -04:00
467d1e0d42
Use bold formatting for required variable
2018-03-30 14:37:12 -04:00
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
4117affaef
Catch up with master properly
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-30 13:10:24 -04:00
5f1d8ee309
Final test updates
2018-03-30 13:00:59 -04:00
6bde082a04
Skip some tests on 2.7
2018-03-30 12:38:11 -04:00
3e07c809eb
Undo capsys, reorder install and lock
2018-03-30 12:37:17 -04:00
28a6cb4805
Disable capsys to capture stdout/stderr
2018-03-30 12:37:17 -04:00
a4bbed3f69
Block for debugging
2018-03-30 12:37:16 -04:00
b5ae7cc0bb
Just always require suffix then
...
This is not the TemporaryDirectory you are looking for.
2018-03-30 12:37:16 -04:00
ba93ad2da5
Never mock PyPI half-way, either do, or don't
2018-03-30 12:37:16 -04:00
42d83dbbac
Need to use the backported TemporaryDirectory
2018-03-30 12:37:15 -04:00
6cd545b8c6
Monkey-patch pipfile.api to use the mocked index
2018-03-30 12:37:15 -04:00
1c9792434d
Un-mock maya
2018-03-30 12:37:15 -04:00
a3dcc66844
Refactor
2018-03-30 12:37:13 -04:00
67de4891a9
Skip Internet and add verbose flag if possible
2018-03-30 12:36:37 -04:00
8a39fbceaa
Actually use mocked PyPI when testing with locking
2018-03-30 12:36:34 -04:00
0cb0f8999f
Fix scripts and source errors not caught before
2018-03-30 12:32:07 -04:00
fa424989f3
Fix ConTOML's __str__ on Python 3
2018-03-30 12:30:22 -04:00
8f0af53fb5
Merge pull request #1865 from frostming/pass-pre-flag
...
Pass allow_prereleases setting to lock
2018-03-30 12:28:06 -04:00
786929b0bf
remove redundant lines
2018-03-30 22:35:48 +08:00
aff9078985
pass pre flag to lock
2018-03-30 22:35:48 +08:00
3060c8d3d8
Merge branch 'master' into patch-2
2018-03-30 09:59:15 -04:00
979577d971
Merge pull request #1870 from gsemet/gitignore
...
ignore .tox folder
2018-03-30 09:58:59 -04:00
46b2fe512e
Merge branch 'master' into patch-2
2018-03-30 09:58:28 -04:00
8cc4a45bc2
Merge pull request #1878 from svanburen/patch-2
...
Update advanced.rst
2018-03-30 09:49:47 -04:00
060a1d652c
Merge branch 'master' into patch-2
2018-03-30 09:48:50 -04:00
7a861c4a2c
Merge pull request #1854 from pypa/locking-handle-eggs
...
Ensure locking works with eggs
2018-03-30 00:59:46 -04:00
00ebba4b58
Switch to tablib and try again
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-29 22:00:44 -04:00
0af19190d1
Bugfix
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-29 21:26:42 -04:00
a62ec1c40a
HISTORY.txt update
2018-03-29 21:15:30 -04:00
4043ee57f6
Merge branch 'jtratner/fix-scripts-quoting' into locking-handle-eggs
2018-03-29 21:12:13 -04:00
e4a5b2caf6
Simplify
2018-03-29 17:59:34 -07:00
15c19ee001
Make run easier to understand
2018-03-29 17:57:04 -07:00
15bb50cfa4
Add some markers
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-29 20:43:27 -04:00
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
939d77cf40
Update advanced.rst
...
Needs an extra `:` to render the .rst properly
2018-03-29 11:31:30 -04:00
7445e7cd73
Mention PIPENV_IGNORE_VIRTUALENVS in help message
...
When running pipenv in a virtualenv, it will use that virtualenv instead
of creating its own. A message will be shown when this happens, but it
didn't mention the way to avoid this behavior, which is setting the
PIPENV_IGNORE_VIRTUALENVS environment variable.
2018-03-29 11:24:03 -04:00
139d8bd553
Merge branch 'master' into locking-handle-eggs
2018-03-29 09:32:20 -04:00
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
Dan Ryan