Commit Graph

452 Commits

Author SHA1 Message Date
Jeff Tratner ca19061d87 Add doc note about lock hash too 2018-03-23 15:35:12 -07:00
Jeff Tratner 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
kennethreitz 6f0c1afea7 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-21 07:10:44 -04:00
kennethreitz 8987c3aa97 Merge branch 'master' of github.com:pypa/pipenv
# Conflicts:
#	HISTORY.txt
2018-03-21 06:33:09 -04:00
kennethreitz 6492f72f96 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-21 06:31:54 -04:00
kennethreitz 57aecc3b4b history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-20 08:22:23 -04:00
kennethreitz 0760cf0a9c attempt
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 08:19:42 -04:00
kennethreitz 2bba03f973 pipenv --update
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:47:32 -04:00
kennethreitz c52300a5ca history / version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-19 06:24:49 -04:00
kennethreitz f383751158 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-14 19:20:13 -04:00
kennethreitz 94e2ea3f6c locking bug
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-14 19:00:20 -04:00
kennethreitz 53fd7d68f9 next version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-14 11:23:40 -04:00
kennethreitz 25df09c171 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-14 09:44:03 -04:00
kennethreitz 57c20999c6 version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-14 07:00:32 -04:00
kennethreitz 998220ff9e 11.7.1
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 21:02:11 -04:00
kennethreitz e7971865b2 next version 2018-03-13 20:08:45 -04:00
kennethreitz 47e97b825d next version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 15:11:46 -04:00
kennethreitz 92ef38943f history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 14:34:24 -04:00
kennethreitz cee5da8315 windows bug
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 12:34:52 -04:00
kennethreitz f0fa02154d history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 12:23:59 -04:00
kennethreitz 0b5576a635 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 11:45:06 -04:00
kennethreitz 9001855188 certifi
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 10:15:05 -04:00
kennethreitz bfc5268a27 history
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.

#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 09:21:07 -04:00
kennethreitz f716eac2ea bug fixes
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 07:53:42 -04:00
kennethreitz 81c97f35ee history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 07:51:43 -04:00
kennethreitz e672a8021b notes 2018-03-12 17:28:50 -04:00
kennethreitz 4f76dbc0bf caps
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-12 10:54:55 -04:00
kennethreitz 80b97c0faa history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-12 10:48:52 -04:00
kennethreitz e00e714251 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-12 09:38:15 -04:00
kennethreitz 9ac3d05955 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-12 08:50:25 -04:00
kennethreitz 2f99422374 pipenv version 2018-03-12 08:40:56 -04:00
kennethreitz 473ebbf0ad version bump
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 14:30:43 -04:00
kennethreitz d3c840879f history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 14:14:20 -04:00
kennethreitz 6c8273eae9 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 12:26:53 -04:00
kennethreitz 6817be9202 fix bug
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 11:45:52 -04:00
kennethreitz dab7e04ff9 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 09:20:14 -04:00
kennethreitz 77bc0b6450 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 08:51:32 -04:00
kennethreitz 48fce46b83 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 08:22:41 -04:00
kennethreitz fea64ede1a next version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-11 00:43:12 -05:00
kennethreitz 1c2ccf989e history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-10 09:52:29 -05:00
kennethreitz 2419ee01a1 fix shell --fancy
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-10 08:43:02 -05:00
kennethreitz 7a7c244a7b history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-10 08:18:03 -05:00
kennethreitz b83a9b9d97 just fallback on sys.executable
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-10 08:09:54 -05:00
kennethreitz f8f838a9f0 version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 20:20:22 -05:00
kennethreitz 9f3e4deb6b bug fix
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 19:58:07 -05:00
kennethreitz 82e984b807 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 16:08:58 -05:00
kennethreitz 2e7a4eeb00 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 15:23:04 -05:00
kennethreitz fce890f3cf next version
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 14:55:32 -05:00
kennethreitz f3f0971a95 history
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 10:06:06 -05:00
kennethreitz 08176fe9b9 sigh
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-09 07:52:12 -05:00