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
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
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
7afa528c0f
Fix small test case typo
2018-03-28 23:54:00 -07:00
71896d1f20
Skip python 3 only test on py2
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-29 00:48:01 -04:00
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
4a425c3429
Add regression tests for resolver changes
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-03-28 23:00:38 -04:00
66e3f556fc
Exclude markers from top level dependencies
2018-03-28 21:48:49 -04:00
319c0b3d65
Always include markers when resolving
2018-03-28 21:38:14 -04:00
d28ec00678
Clean up resolver marker deduplication
2018-03-28 20:36:28 -04:00
bc61441922
Skip unsupported extensions
...
- Always skip unsupported extensions (like .egg) even when
passing `ignore_compatibility=True`
2018-03-28 18:55:15 -04:00
094044d502
Python 3.6.5
2018-03-28 18:25:59 -04:00
7697541dc0
Merge branch 'master' into locking-handle-eggs
2018-03-28 18:00:01 -04:00
7c4f09e812
ignore .tox folder
2018-03-28 21:48:04 +02:00
b0445a2c0b
Lint fixes
...
Fix up tests a little more
Use temp_environ rather than monkeypatch
2018-03-27 15:30:22 -04:00
63f7e988f7
Misc. typos
...
Found via `codespell -q 3`
2018-03-27 13:42:27 -04:00
f5f24b47e5
Combine RUN apt-get calls in Dockerfile
...
- with the calls in separate lines, there can be caching issues
- changed `apt` to `apt-get` to stop instability warnings
2018-03-27 13:41:55 -04:00
419e0310e4
update Pipfile.lock
2018-03-27 02:18:34 -04:00
e4bdc0fb5b
Add randomwords and missing requests artifacts
2018-03-27 01:17:04 -04:00
f8499281e8
Ensure locking works with eggs
...
Patch notpip to recognise .egg formats on PyPI. Close #1849 , ref #1850 .
2018-03-27 12:16:47 +08:00
b6a333be87
Set -o pipefail so errors propagate through piping
...
This prevents the pipe syntax in the $TAP_OUTPUT branch from masking
the underlying pytest failure.
2018-03-26 23:18:37 -04:00
874ddfc0b2
Merge pull request #1842 from pypa/bugfix/windows-pipfile-scripts
...
Fix `shlex.split()` call to check for posix first
2018-03-26 18:32:10 +08:00
c590e80449
Some tests for the scripts section
2018-03-26 15:48:06 +08:00
b91a439727
Merge branch 'master' into bugfix/windows-pipfile-scripts
2018-03-25 19:22:32 -04:00
0ec97edbf7
Merge pull request #1844 from davilima6/typo
...
fix typo
2018-03-26 02:42:19 +08:00
01d56cc8a0
fix typo
2018-03-25 19:37:55 +02:00
7d204ac474
Merge pull request #1840 from jtratner/detect-dotvenv-in-subdirectories
...
Detect .venv at project root when in subdirectory
2018-03-25 13:49:01 +08:00
052c57c59c
Don't use six.u
2018-03-24 14:18:26 -04:00
844bc3f7d1
Fix pipenv scripts for windows shell
2018-03-24 12:45:46 -04:00
f36f7ca1bc
Fix shlex.split() call to check for posix first
...
- Currently it assumes posix complience and uses `posix=True`
- This breaks when parsing on windows
2018-03-23 23:48:44 -04:00
ca19061d87
Add doc note about lock hash too
2018-03-23 15:35:12 -07:00
ebf5ed843b
Detect .venv at project root when in subdirectory
...
Also remove `PIPENV_SHELL_COMPAT` which appears to be no longer used.
(confirmed test case fails without this change and passes with it).
2018-03-23 15:35:12 -07:00
c7cd4bd864
Merge pull request #1836 from jtratner/fix-env-calculation-with-hashes
...
Fix env calculation with hashes
2018-03-23 16:06:13 +08:00
5cf7a7d552
Add doc note about environment variables
2018-03-23 00:17:28 -07:00
8f79f13ea4
Split hash function into two
2018-03-23 00:11:34 -07:00
Dan Ryan