Merge remote-tracking branch 'origin/master' into update-vendored-deps

CONTRIBUTING.md

@@ -3,8 +3,8 @@
 Before opening any issues or proposing any pull requests, please do the
 following:
 
-1. Read our [Contributor's Guide](https://docs.pipenv.org/dev/contributing/).
-2. Understand our [development philosophy](https://docs.pipenv.org/dev/philosophy/).
+1. Read our [Contributor's Guide](https://docs.pipenv.org/en/latest/dev/contributing/).
+2. Understand our [development philosophy](https://docs.pipenv.org/en/latest/dev/philosophy/).
 
 To get the greatest chance of helpful responses, please also observe the
 following additional notes.

Dockerfile

@@ -3,9 +3,11 @@ FROM heroku/heroku:18-build
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
+# Python, don't write bytecode!
+ENV PYTHONDONTWRITEBYTECODE 1
 
 # -- Install Pipenv:
-RUN apt update && apt upgrade -y && apt install python3.7-dev -y
+RUN apt update && apt upgrade -y && apt install python3.7-dev libffi-dev -y
 RUN curl --silent https://bootstrap.pypa.io/get-pip.py | python3.7
 
 # Backwards compatility.

README.md

@@ -46,6 +46,10 @@ If you\'re on MacOS, you can install Pipenv easily with Homebrew:
 
     $ brew install pipenv
 
+Or, if you\'re using Debian Buster+:
+
+    $ sudo apt install pipenv
+
 Or, if you\'re using Fedora 28:
 
     $ sudo dnf install pipenv
@@ -54,7 +58,7 @@ Or, if you\'re using FreeBSD:
 
     # pkg install py36-pipenv
 
-Otherwise, refer to the [documentation](https://docs.pipenv.org/install/) for instructions.
+Otherwise, refer to the [documentation](https://docs.pipenv.org/en/latest/install/#installing-pipenv) for instructions.
 
 ✨🍰✨
 

docs/_templates/sidebarintro.html

@@ -8,12 +8,32 @@
   <iframe src="https://ghbtns.com/github-btn.html?user=pypa&repo=pipenv&type=watch&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+<style>
+.algolia-autocomplete{
+  width: 100%;
+  height: 1.5em
+}
+.algolia-autocomplete a{
+  border-bottom: none !important;
+}
+#doc_search{
+  width: 100%;
+  height: 100%;
+}
+</style>
+<input id="doc_search" placeholder="Search the doc" autofocus/>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" onload="docsearch({
+  apiKey: '0dbb76467f0c180a1344fc46858df17b',
+  indexName: 'pipenv',
+  inputSelector: '#doc_search',
+  debug: false // Set debug to true if you want to inspect the dropdown
+})" async></script>
 
 <p>
   <strong>Pipenv</strong> is a production-ready tool that aims to bring the best of all packaging worlds to the Python world. It harnesses Pipfile, pip, and virtualenv into one single command.
   <p>It features very pretty terminal colors.</p>
 </p>
-
 <h3>Stay Informed</h3>
 <p>Receive updates on new releases and upcoming projects.</p>
 

docs/_templates/sidebarlogo.html

@@ -8,6 +8,27 @@
   <iframe src="https://ghbtns.com/github-btn.html?user=pypa&repo=pipenv&type=watch&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+<style>
+  .algolia-autocomplete{
+    width: 100%;
+    height: 1.5em
+  }
+  .algolia-autocomplete a{
+    border-bottom: none !important;
+  }
+  #doc_search{
+    width: 100%;
+    height: 100%;
+  }
+  </style>
+  <input id="doc_search" placeholder="Search the doc" autofocus/>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" onload="docsearch({
+    apiKey: '0dbb76467f0c180a1344fc46858df17b',
+    indexName: 'pipenv',
+    inputSelector: '#doc_search',
+    debug: false // Set debug to true if you want to inspect the dropdown
+  })" async></script>
 
 <p>
   <strong>Pipenv</strong> is a production-ready tool that aims to bring the best of all packaging worlds to the Python world. It harnesses Pipfile, pip, and virtualenv into one single command.

news/3711.trivial.rst

@@ -0,0 +1 @@
+Add installation instructions for Debian Buster+ in README

news/3724.trivial.rst

@@ -0,0 +1 @@
+Update pytest configuration to support pytest 4.

tests/integration/conftest.py

@@ -88,21 +88,21 @@ prepare_fixtures(os.path.join(PYPI_VENDOR_DIR, "fixtures"))
 
 
 def pytest_runtest_setup(item):
-    if item.get_marker('needs_internet') is not None and not WE_HAVE_INTERNET:
+    if item.get_closest_marker('needs_internet') is not None and not WE_HAVE_INTERNET:
         pytest.skip('requires internet')
-    if item.get_marker('needs_github_ssh') is not None and not WE_HAVE_GITHUB_SSH_KEYS:
+    if item.get_closest_marker('needs_github_ssh') is not None and not WE_HAVE_GITHUB_SSH_KEYS:
         pytest.skip('requires github ssh')
-    if item.get_marker('needs_hg') is not None and not WE_HAVE_HG:
+    if item.get_closest_marker('needs_hg') is not None and not WE_HAVE_HG:
         pytest.skip('requires mercurial')
-    if item.get_marker('skip_py27_win') is not None and (
+    if item.get_closest_marker('skip_py27_win') is not None and (
         sys.version_info[:2] <= (2, 7) and os.name == "nt"
     ):
         pytest.skip('must use python > 2.7 on windows')
-    if item.get_marker('py3_only') is not None and (
+    if item.get_closest_marker('py3_only') is not None and (
         sys.version_info < (3, 0)
     ):
         pytest.skip('test only runs on python 3')
-    if item.get_marker('lte_py36') is not None and (
+    if item.get_closest_marker('lte_py36') is not None and (
         sys.version_info >= (3, 7)
     ):
         pytest.skip('test only runs on python < 3.7')