Merge branch 'master' into fix#2846-good-error-message

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,8 @@
 Be sure to check the existing issues (both open and closed!), and make sure you are running the latest version of Pipenv.
 
-If you're requesting a new feature or leaving feedback, please use this forum instead:
+If you're requesting a new feature, please use the PEEP process:
 
-    https://kenneth-reitz.uservoice.com/forums/913660-general
+    https://github.com/pypa/pipenv/blob/master/peeps/PEEP-000.md
 
 Check the [diagnose documentation](https://docs.pipenv.org/diagnose/) for common issues before posting! We may close your issue if it is very similar to one of them. Please be considerate, or be on your way.
 

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -5,11 +5,10 @@ about: Suggest an idea for this project
 
 Be sure to check the existing issues (both open and closed!), and make sure you are running the latest version of Pipenv.
 
-Check the [diagnose documentation](https://docs.pipenv.org/diagnose/) for common issues before posting! We may close your issue if it is very similar to one of them. Please be considerate, or be on your way.
+Check the [diagnose documentation](https://docs.pipenv.org/diagnose/) for common issues and the [PEEP list](https://github.com/pypa/pipenv/blob/master/peeps/) before posting! We may close your issue if it is very similar to one of them. Please be considerate and follow the PEEP process, or be on your way.
 
 Make sure to mention your debugging experience if the documented solution failed.
 
-
 ##### Is your feature request related to a problem? Please describe.
 
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,9 @@ What is the thing you want to fix? Is it associated with an issue on GitHub? Ple
 
 Always consider opening an issue first to describe your problem, so we can discuss what is the best way to amend it.  Note that if you do not describe the goal of this change or link to a related issue, the maintainers may close the PR without further review.
 
+If your pull request makes a non-insignificant change to Pipenv, such as the user interface or intended functionality, please file a PEEP. 
+
+    https://github.com/pypa/pipenv/blob/master/peeps/PEEP-000.md
 
 ##### The fix
 

NOTICES

@@ -1,3 +1,5 @@
 The contents of the vendor and patched directories are subject to different licenses
-than the rest of this project. Their respective licenses can be looked
-up at pypi.python.org or in their corresponding LICENSE files.
+than the rest of this project. 
+
+Their respective licenses can be looked up at pypi.python.org or in their 
+corresponding LICENSE files.

news/2909.doc

@@ -0,0 +1 @@
+Replace reference to uservoice with PEEP-000

news/2912.bugfix

@@ -0,0 +1 @@
+Fixed pip is not loaded from pipenv's patched one but the system one

pipenv/environments.py

@@ -11,6 +11,8 @@
 # https://bugs.python.org/issue22490
 os.environ.pop("__PYVENV_LAUNCHER__", None)
 
+# Load patched pip instead of system pip
+os.environ["PIP_SHIMS_BASE_MODULE"] = "pipenv.patched.notpip"
 
 PIPENV_CACHE_DIR = os.environ.get("PIPENV_CACHE_DIR", user_cache_dir("pipenv"))
 """Location for Pipenv to store it's package cache.