Vendoring improvements

Makefile

@@ -71,6 +71,7 @@ submodules:
 # e.g make tests RAMDISK=1
 .PHONY: tests
 tests: parallel ?= -n auto
+tests: suite ?=
 tests: submodules test-install
 	source $(get_venv_path)/bin/activate && \
 		pipenv run pytest -ra $(parallel) -vvv --full-trace --tb=long

RELEASING.md

@@ -87,11 +87,11 @@ Now we will need to update the lockfile. This is required to ensure tests run ag
 # use the latest python here
 $ export PIPENV_PYTHON=3.8
 $ pipenv lock --dev
-# Inspect the changes in a diff viewer, for example we should keep the python 2 dependencies to use for running tests
+# Inspect the changes in a diff viewer, for example we should keep the older Python dependencies to use for running tests
 # on completion, stage the relevant changes
-$ export PIPENV_PYTHON=2.7
+$ export PIPENV_PYTHON=3.7
 $ pipenv lock --keep-outdated --dev
-# this helps avoid overwriting the entire lockfile and should introduce only the changes required to run tests on python 2
+# this helps avoid overwriting the entire lockfile and should introduce only the changes required to run tests on previous Python versions
 # inspect the resulting lockfile and commit the changes
 $ git commit
 ```
@@ -103,8 +103,6 @@ Test pipenv locally. If tests pass, you can go ahead and make a PR to merge what
 ```bash
 $ export PIPENV_PYTHON=3.8
 $ pipenv install --dev && pytest -ra tests
-$ export PIPENV_PYTHON=2.7
-$ pipenv install --dev && pytest -ra tests
 ```
 
 ## Check Spelling in Documentation
@@ -152,8 +150,6 @@ If in doubt, follow the basic instructions below.
 8. Wait a week, then update version number to a canonical release and re-release on PyPI.org
 10. Publicize on lists, Discourse, GitHub issues
 
-
-
 ## Looking ahead
 
 Most of the pipenv related ecosystem libraries are using [GitHub actions](https://github.com/sarugaku/vistir/blob/master/.github/workflows/pypi_upload.yml) to automate releases when tags are pushed. Most likely we will look to move in this direction and simplify the process.

docs/dev/contributing.rst

@@ -230,9 +230,11 @@ be aware of the following things when filing bug reports:
 Run the tests
 -------------
 
-Two ways of running the tests are as follows:
+There are a few ways of running the tests:
 
-1. ``./run-tests.sh`` or ``run-tests.bat``
+1. run-tests.sh
+
+The scripts for bash or windows: ``./run-tests.sh`` and ``run-tests.bat``
 
 Note that, you override the default Python Pipenv will use with
 PIPENV_PYTHON and the Python binary name with PYTHON in case it
@@ -253,7 +255,9 @@ you run it before you open a PR. Taking this second approach,
 will allow you, for example, to run a single test case, or
 ``fail fast`` if you need it.
 
-2. Manually, which repeat the steps of the scripts above:
+2. Manually
+
+This repeats the steps of the scripts above:
 
 .. code-block:: console
 
@@ -280,6 +284,19 @@ $ docker run --rm -v $(pwd):/usr/src -it python:3.7 bash
 # bash run-tests.sh
 ```
 
+3. Using the Makefile:
+
+The Makefile automates all the task as in the script. However, it allows
+one more fine grained control on every step. For example::
+
+    $ make ramdisk  # create a ram disk to preserve your SSDs life
+    $ make ramdisk-virtualenv
+    $ make test suite="-m not cli"  # run all tests but cli
+
+or ::
+
+    $ make tests parallel="" suite="tests/integration/test_cli.py::test_pipenv_check"
+
 It is important that your environment is setup correctly, and
 this may take some work, for example, on a specific Mac installation, the following
 steps may be needed:

pipenv/patched/README.md

@@ -3,7 +3,6 @@
 - Pip is modified, to make it work with Pipenv's custom virtualenv locations.
 - Pip is modified, to make it work with pip-tool modifications.
 - Pip is modified, to make it resolve deep extras links.
-- Crayons is upgraded.
 - Safety is hacked together to always work on any system.
 - TOML libraries are upgraded to... work.
 

pipenv/patched/safety/__main__.py

@@ -44,8 +44,5 @@ def insert_pipenv_dirs():
 
 if __name__ == "__main__":  # pragma: no cover
     insert_pipenv_dirs()
-    yaml_lib = "pipenv.patched.yaml{0}".format(sys.version_info[0])
-    locals()[yaml_lib] = __import__(yaml_lib)
-    sys.modules["yaml"] = sys.modules[yaml_lib]
     from pipenv.patched.safety.cli import cli
     cli(prog_name="safety")