Commit Graph

3358 Commits

Author SHA1 Message Date
kennethreitz cb83aa38ee oops
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 20:04:46 -05:00
kennethreitz 9f3e4deb6b bug fix
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 19:58:07 -05:00
kennethreitz 2ef26fdc8d fix json api calls
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 19:54:58 -05:00
kennethreitz 82e984b807 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.2.0
2018-03-09 16:08:58 -05:00
kennethreitz 6f7f8aff71 reduce the number of BAD_PACKAGES
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 16:08:17 -05:00
kennethreitz 2e7a4eeb00 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.1.11
2018-03-09 15:23:04 -05:00
kennethreitz dea01f8b63 Merge branch 'master' of github.com:pypa/pipenv 2018-03-09 15:22:50 -05:00
kennethreitz 6236c0614c 11.1.11
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 15:22:40 -05:00
kennethreitz 75d62edf09 next version of help, with prettier 2.7 output
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 15:22:24 -05:00
kennethreitz 0875e8dc46 next version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.1.10
2018-03-09 15:20:32 -05:00
kennethreitz 9d5760e746 fix help
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 15:20:17 -05:00
kennethreitz 7827ab3d9a Merge pull request #1641 from jtratner/site-packages-with-conda
Site packages with conda
2018-03-09 15:15:54 -05:00
kennethreitz 550d2d6630 Update advanced.rst 2018-03-09 15:15:39 -05:00
kennethreitz 9bfa0afefd issue template
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 15:03:29 -05:00
Jeff Tratner 2ca6255734 Site packages with conda 2018-03-09 11:59:00 -08:00
kennethreitz d54d5a5f0b history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.1.9
2018-03-09 14:55:44 -05:00
kennethreitz fce890f3cf next version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 14:55:32 -05:00
kennethreitz 2f5f68b62f better help
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 14:55:09 -05:00
kennethreitz f35d76299d $ python -m pipenv.help
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 14:36:22 -05:00
kennethreitz f3f0971a95 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.1.8
2018-03-09 10:06:06 -05:00
kennethreitz b35d5f51fe cleanup
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 10:05:50 -05:00
kennethreitz c115de8b97 next version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 10:04:18 -05:00
kennethreitz a037973d0e cleanup
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 09:58:19 -05:00
kennethreitz 7cb1439e04 fix bug
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 09:57:24 -05:00
kennethreitz 5336e4317d better debugging
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 09:53:50 -05:00
kennethreitz e025d4aa79 get both fancier and less fancy at the same time
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 09:46:34 -05:00
kennethreitz fd1972a56e pipenv-resolver
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 08:24:12 -05:00
kennethreitz 679250ba17 pipenv version bump
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v11.1.7
2018-03-09 07:52:35 -05:00
kennethreitz 08176fe9b9 sigh
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 07:52:12 -05:00
kennethreitz ea4b5893e4 oops
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 07:51:54 -05:00
kennethreitz 06076be4ba 11.1.6 v11.1.6 2018-03-09 05:01:21 -05:00
kennethreitz 96252e69a0 py
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 05:01:07 -05:00
kennethreitz 8f1ae30fdb bugfixes
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 05:00:47 -05:00
kennethreitz b5dbd4597e Merge pull request #1627 from uranusjr/ask-py
Ask py.exe for its opinion when choosing a Python
2018-03-09 04:59:44 -05:00
Tzu-ping Chung 997b224168 Python 2 and 3 compatibility
subprocess.check_call does not have encoding= on Python 2. I really need
to learn how delegator works.
2018-03-09 15:35:46 +08:00
Tzu-ping Chung ac3d4260dc Ask py.exe for its opinion when choosing a Python
Hopefully a viable alternative to #1620. In addition to looking for
executables in PATH, also asks py.exe (if there is one) for its opinion
when choosing an executable. Windows users would be able to use the
--two, --three, and --python=<VERSION> syntax as others do; this will be
passed on to py.exe and ask if it can find any matching executable.

Non-Windows users will not be affected because there wouldn't be a py.exe
to start with.
2018-03-09 15:22:15 +08:00
kennethreitz 618249fdaa Merge pull request #1621 from pypa/bugfix/windows-bugs
Shellquote all shell execs for path escaping
2018-03-09 01:46:11 -05:00
kennethreitz 5d5e835a1b Merge branch 'master' into bugfix/windows-bugs 2018-03-09 01:46:01 -05:00
kennethreitz c502b2e66c Merge pull request #1624 from pypa/bugfix/resolver-markers
Fix new resolver code to uniqueify markers
2018-03-09 01:44:39 -05:00
kennethreitz 0050d0efe6 Merge pull request #1626 from uranusjr/fix-no-python-in-path
Avoid type error when there’s no Python in PATH
2018-03-09 01:44:22 -05:00
Tzu-ping Chung 1ff79911a0 Consider py.exe when detecting wrong versions
Related to #1620, I feel this is a nice addition.
2018-03-09 13:58:41 +08:00
Tzu-ping Chung c229b785ad Display version warning only when python exists
When there is no "python" command available, there's nothing to warn
about.

Fix #1619.
2018-03-09 13:52:47 +08:00
Dan Ryan 8cc5b5c28e Fix new resolver code to uniqueify markers
- Fixes #1617, #1622
2018-03-08 22:51:12 -05:00
Dan Ryan 69f5128e7a Merge branch 'bugfix/windows-bugs' of github.com:pypa/pipenv into bugfix/windows-bugs 2018-03-08 21:56:56 -05:00
Dan Ryan 78854115f0 Don't shellquote list-type subprocess input 2018-03-08 21:56:07 -05:00
Dan Ryan 3a7274838e Merge branch 'master' into bugfix/windows-bugs 2018-03-08 18:41:22 -05:00
kennethreitz f2aa362bd5 Merge pull request #1623 from brettcannon/patch-2
Use VS Code as the example editor for EDITOR usage
2018-03-08 18:24:47 -05:00
Brett Cannon 01c34e3b72 Use VS Code as the example editor for EDITOR usage
Now that VS Code has pipenv support out of the box, might at well use an example that doesn't require any extra setup 😉
2018-03-08 15:23:14 -08:00
kennethreitz 876f077254 Merge branch 'master' into bugfix/windows-bugs 2018-03-08 18:12:16 -05:00
Dan Ryan d0ed21a35d Shellquote all shell execs for path escaping
- fixes 1618 (maybe)
2018-03-08 18:07:23 -05:00