b80dc95fdf
Merge branch 'master' into patch-2
2018-06-08 01:04:21 +08:00
e00fce7335
Merge pull request #2309 from pypa/requirementtxt-fix
...
Don't search for requirements.txt if using pipfile
2018-06-08 01:04:11 +08:00
0d5ab61760
Merge branch 'master' into requirementtxt-fix
2018-06-08 00:57:27 +08:00
066dc938bb
Merge pull request #2307 from greysteil/fix-typo
...
Fix typo (actually_resolve_reps -> actually_resolve_deps)
2018-06-08 00:18:39 +08:00
0ab11ccb68
punctuation: removed unnecessary comma
2018-06-06 10:18:50 +02:00
83e1ba9a2d
Don't search for requirements.txt if using pipfile
...
- Also don't search for requirements.txt if taking in a package name
- Fixes #2222
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-06-06 01:35:19 -04:00
39ca6b272a
Fix typo (actually_resolve_reps -> actually_resolve_deps)
2018-06-05 14:56:14 +01:00
e937d85515
Merge pull request #2301 from pypa/bugfix/2219-system-creates-virtualenv
...
Dont create virtualenvs with `--system --deploy`
2018-06-03 22:25:38 -04:00
8932f453e1
Dont create virtualenvs with --system --deploy
...
- Fixes #2219 , #2273
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-06-03 21:25:59 -04:00
6e7d362e92
Merge pull request #2263 from pypa/better-activate-this-error
...
Provide better error message for activate_this.py
2018-06-03 21:13:00 -04:00
6d6e85b656
Merge branch 'master' into better-activate-this-error
2018-06-03 21:12:47 -04:00
62e01b43cc
Merge pull request #2268 from pypa/bugfix/cli-graph
...
Fix pipenv graph
2018-06-03 21:11:52 -04:00
97115ee253
Merge branch 'master' into bugfix/cli-graph
2018-06-03 17:12:39 -04:00
19b05b4e63
Merge pull request #2298 from pypa/windows-find-executable-pathext
...
Respect PATHEXT when looking for Win executable
2018-06-03 17:09:23 -04:00
d48e97e1a8
Respect PATHEXT when looking for Win executable
...
... as idiomatic in Windows programming.
2018-06-03 15:51:37 +08:00
f91f53b5cc
Merge pull request #2262 from pypa/nelfin-fix-2229
...
Nelfin fix 2229
2018-06-01 11:04:22 +08:00
5788db3312
Fix IndexError parsing comments from pip freeze
...
Ref #2229 . This change only fixes the issue seen when calling `pipenv
clean`. A future refactor should consolidate these behaviours (or use
the actual parsing of lines from pip, i.e. FrozenRequirement, if we can
rely on this API).
2018-06-01 07:24:34 +08:00
eb839e52b6
Add test of behaviour in issue #2229
...
requirements.txt files (and by extension pipfreeze) can contain comment
lines, but the stdout of pip freeze is used in a number of places with
the assumption that every line contains a dependency declaration. This
change adds an integration test that could trigger one of these cases
that was the cause of the behaviour seen in issue #2229 .
2018-06-01 07:24:34 +08:00
3ce4299af7
Merge branch 'master' into better-activate-this-error
2018-05-29 00:22:00 -04:00
2a12340d7f
Merge branch 'master' into bugfix/cli-graph
2018-05-28 18:56:35 -04:00
e135f7c06f
Merge pull request #2267 from pypa/feature/better-resolver
...
Feature/better resolver
2018-05-28 17:26:53 +09:00
b60548172b
Update patch
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-28 00:55:17 -04:00
a5e69e4a61
Comments
2018-05-28 13:37:34 +09:00
824f822bc7
Don't shell escape posix-style paths
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 14:34:21 -04:00
311c90d191
Fix lockfile filename parsing
...
- convert to string properly
2018-05-27 14:26:30 -04:00
e993ee874d
Use filesystem compatible encodings for strings
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 13:52:39 -04:00
cc68b365e0
formatting cleanup and posix style paths
...
- fix for windows vcs urls
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 13:35:25 -04:00
6737ab8b03
SpecifierSet logic fix
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 13:00:08 -04:00
a4d838902c
Logic fix
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 12:56:46 -04:00
8548fbbb3e
It is important to check for python_requires
...
- The specifierset will fail otherwise
- We don't want to include only things that have this
-- we want to _exclude_ things that do not match it
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 02:35:46 -04:00
9e661519e0
Probably write unicode strings...
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 02:27:58 -04:00
eae8ac919c
Update piptools patch
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 02:23:07 -04:00
892be4650e
Merge branch 'feature/better-resolver' of github.com:pypa/pipenv into feature/better-resolver
2018-05-27 02:19:57 -04:00
1d54a32dc5
Add sources and caches to pip calls
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-27 02:19:32 -04:00
f91371aa55
Code clean up
...
This shouldn't affect any functionalities, only clean up some generator
usages to reduce repeated looping through requirements.
2018-05-27 14:02:00 +09:00
f532b2eb86
Use pipenv cache dir for caching wheels
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 23:39:34 -04:00
297d3a05f3
Merge pull request #2269 from pypa/bugfix/windows-relpaths
...
Update requirementslib to fix windows paths
2018-05-26 21:05:38 -04:00
84c0b09193
Fix marker parsing bug
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 21:03:34 -04:00
bba2f38d91
Patch piptools to use current environment python
...
- Fixes #2088 , #2234 , #1901
- Fully leverage piptools' compile functionality by using constraints
in the same `RequirementSet` during resolution
- Use `PIP_PYTHON_PATH` for compatibility check to filter out
`requires_python` markers
- Fix vcs resolution
- Update JSON API endpoints
- Enhance resolution for editable dependencies
- Minor fix for adding packages to pipfiles
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 21:03:34 -04:00
7abc2fd3a1
Use piptools constraints files more properly
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 21:02:51 -04:00
d55e400379
Better handling of wheels / update requirementslib
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 19:57:41 -04:00
513bdfb0d2
Update requirementslib to fix windows paths
...
- Fixes #2256
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 17:47:28 -04:00
53a23586f8
Fix pipenv graph to use local pip
...
- Fixes #2258
- Add patch to prevent import rewrites from catching this again
- Add useful debugging line to print errors to stderr
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 16:21:00 -04:00
4b5a4ef224
Update pipdeptree
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-26 16:07:10 -04:00
2fc28bcc0a
Provide better error message for activate_this.py
...
Ref #2257 .
2018-05-25 17:42:41 +09:00
9550056344
Merge pull request #2261 from pypa/venv-in-project-without-project
...
Fix venv discovery
2018-05-25 03:17:56 -04:00
1e0882c74d
Fix venv discovery
...
If we don't have a project, we don't have an associated environment.
2018-05-25 14:12:55 +09:00
e41c0659fd
Merge pull request #1962 from techalchemy/feature/requirements-refactor
...
Requirements Refactor (ready to merge, after conflict resolution)
2018-05-24 00:41:28 -04:00
aa4ca1bfd4
Fix special case resolution with ignore python
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-23 23:55:09 -04:00
e2dae9b50e
Handle prep failures for dist preparation
...
Signed-off-by: Dan Ryan <dan@danryan.co >
2018-05-23 22:54:35 -04:00
Tzu-ping Chung