Commit Graph

4214 Commits

Author SHA1 Message Date
kennethreitz 70a7b2bb53 Merge branch 'master' into feature/graph-nested-json 2018-05-16 12:33:24 -04:00
kennethreitz c10b275dab keep travis out of here
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:31:46 -04:00
kennethreitz a6611d280c Merge branch 'master' into feature/graph-nested-json 2018-05-16 12:12:02 -04:00
kennethreitz 5e503e5b26 one line
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:09:13 -04:00
kennethreitz 171bb99e94 even shorter
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:08:48 -04:00
kennethreitz 5853846f5d pipenv shortened
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-16 12:07:56 -04:00
kennethreitz 9350939799 Merge branch 'master' into feature/graph-nested-json 2018-05-16 12:04:39 -04:00
kennethreitz d3d02c7dc2 Merge pull request #2205 from pypa/contributing_docs
adding contribution docs and guidelines to Pipenv
2018-05-16 11:49:12 -04:00
Nate Prewitt 968223448a adding contribution docs and guidelines to Pipenv 2018-05-16 08:44:52 -07:00
Pieterjan Montens bc4bf5660c Merge branch 'master' into feature/graph-nested-json 2018-05-16 11:24:43 +02:00
Dan Ryan 89921f7a95 Merge pull request #2198 from pypa/call-virtualenv-by-module
Call virtualenv by module
2018-05-16 00:16:47 -04:00
Dan Ryan ee36c6a871 Merge branch 'master' into call-virtualenv-by-module 2018-05-16 00:16:38 -04:00
kennethreitz 5ab9603203 Merge pull request #2194 from theacodes/update-recommendation-sentence
Update the wording to clarify Pipenv's overall role in the packaging ecosystem
2018-05-15 21:23:59 -04:00
kennethreitz 2b3314e7f2 Merge branch 'master' into update-recommendation-sentence 2018-05-15 21:23:36 -04:00
Dan Ryan e23532ee44 Merge pull request #2186 from pypa/print-project-location-on-create
Echo Pipfile location during init
2018-05-15 17:57:57 -04:00
Dan Ryan 5d5092f933 Merge branch 'master' into print-project-location-on-create 2018-05-15 17:57:51 -04:00
Dan Ryan d1957f1763 Merge pull request #2181 from pegler/bugfix/2078a-allow-locking-in-virtualenv
Make sure we are not in a virtualenv if aborting
2018-05-15 17:57:37 -04:00
Dan Ryan 904f7d67b2 Merge branch 'master' into call-virtualenv-by-module 2018-05-15 15:57:12 -04:00
Dan Ryan 0d958da3cb Merge branch 'master' into bugfix/2078a-allow-locking-in-virtualenv 2018-05-15 15:56:18 -04:00
Dan Ryan 4a948569ae Merge branch 'master' into print-project-location-on-create 2018-05-15 15:52:26 -04:00
Dan Ryan da5a8b39a1 Merge pull request #2167 from gtalarico/windows-envname-in-prompt
Adds environment name to PROMPT on Cmd, Cmder,ConEmu
2018-05-15 15:52:06 -04:00
Dan Ryan 95459e8985 Merge branch 'master' into windows-envname-in-prompt 2018-05-15 15:51:31 -04:00
Tzu-ping Chung 55d77b2581 Call virtualenv by module instead of command
Fix #2196.
2018-05-16 02:13:54 +08:00
Jon Wayne Parrott 9ba2324298 Update the wording a little 2018-05-15 11:08:45 -07:00
Jon Wayne Parrott 71bf8e5130 Update the wording to clarify Pipenv's overall role in the packaging ecosystem 2018-05-15 09:25:31 -07:00
pmontens 0479d84e97 Added nested json output form pipdeptree to graph command 2018-05-15 14:10:56 +02:00
Tzu-ping Chung fb5c4be763 Echo Pipfile location during init
This should help the user know what's going on in situations like #2185.

Because I'm not very bright
2018-05-15 17:16:04 +08:00
Dan Ryan 4e2fe0155a Merge branch 'master' into bugfix/2078a-allow-locking-in-virtualenv 2018-05-15 00:35:42 -04:00
Dan Ryan 4b07aaa94c Merge pull request #2193 from pypa/remove_cert_bundle
remove cacert.pem bundle
2018-05-15 00:34:30 -04:00
Nate Prewitt e91084ffaf remove cacert.pem bundle 2018-05-14 20:18:32 -07:00
kennethreitz 31664d182f Update issue templates 2018-05-13 16:45:30 -04:00
kennethreitz 968aea1f5a calver
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
v2018.05.18
2018-05-12 17:04:26 -04:00
kennethreitz 410a2912fd ship it
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-05-12 17:02:31 -04:00
kennethreitz 48aa3700da Merge pull request #2184 from pypa/generate-patch-task
Add a task to generate patch file
2018-05-12 16:35:30 -04:00
Tzu-ping Chung 13ab8f9405 Add a task to generate patch file
Because I just can't remember the command
2018-05-13 03:26:50 +08:00
Matt 9738b42241 Add a comment describing the conditional 2018-05-12 12:00:44 -07:00
Matt f741059e2e Make sure we are not in a virtualenv if aborting 2018-05-11 11:26:50 -07:00
Dan Ryan e86e7cfe38 move travis file...
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-10 20:29:02 -04:00
Dan Ryan 2f85170da4 Temporarily re-enable travis
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-10 20:26:17 -04:00
Dan Ryan fa4fd15eaf Merge pull request #2172 from samueldg/typo/history
Fix typo in HISTORY.txt: reqeuests -> requests
2018-05-09 22:32:23 -04:00
Samuel Dion-Girardeau 6d5d1c0644 Fix typo in HISTORY.txt: reqeuests -> requests 2018-05-09 19:17:30 -04:00
gtalarico 0390436d74 Added Pew Patch 2018-05-09 00:56:49 -04:00
Dan Ryan cc80d39b19 Merge pull request #2169 from pypa/bugfix/2132-normalize-drive-shortpath
Bugfix/2132 normalize drive shortpath
2018-05-09 00:42:24 -04:00
Dan Ryan 55e4eb07c7 Expand short paths on windows during testing
- Fixes #2132

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-09 00:40:47 -04:00
Dan Ryan 71b166ab9f Merge pull request #2163 from pypa/dont-report-to-pipenv
Add a message to talk the user away from reporting
2018-05-09 00:37:25 -04:00
Dan Ryan 807cfbe392 Merge branch 'master' into dont-report-to-pipenv 2018-05-09 00:37:03 -04:00
gtalarico a6d5c9df5f Addeds environment name to PROMPT on Cmd, Cmder,ConEmu 2018-05-08 21:55:52 -04:00
Dan Ryan 8c171e943e Version bump for bugfix release
Signed-off-by: Dan Ryan <dan@danryan.co>
v11.10.4
2018-05-08 16:57:37 -04:00
Dan Ryan 904f33ce29 Merge branch 'master' into dont-report-to-pipenv 2018-05-08 16:49:58 -04:00
Tzu-ping Chung c2352029dc Add a message to talk the user away from reporting 2018-05-09 02:30:54 +08:00