Skip to content

Commit

Permalink
Merge remote-tracking branch 'pr3074/dev-doc-testing' into merge-prs
Browse files Browse the repository at this point in the history
- Closes #3074
  • Loading branch information
techalchemy committed Oct 30, 2018
2 parents 62c24ea + 47b6890 commit 36d3847
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ venv.bak/
.spyderproject
.spyproject

# PyCharm project settings
.idea

# Rope project settings
.ropeproject

Expand Down
37 changes: 36 additions & 1 deletion docs/dev/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Steps for Submitting Code
When contributing code, you'll want to follow this checklist:

1. Fork the repository on GitHub.
2. Run the tests to confirm they all pass on your system. If they don't, you'll
2. `Run the tests`_ to confirm they all pass on your system. If they don't, you'll
need to investigate why they fail. If you're unable to diagnose this
yourself, raise it as a bug report by following the guidelines in this
document: :ref:`bug-reports`.
Expand Down Expand Up @@ -120,3 +120,38 @@ hasn't been reported before. Duplicate bug reports are a huge drain on the time
of other contributors, and should be avoided as much as possible.

.. _GitHub issues: https://github.com/pypa/pipenv/issues

Run the tests
-------------

Three ways of running the tests are as follows:

1. ``make test`` (which uses ``docker``)
2. ``./run-tests.sh`` or ``run-tests.bat``
3. Using pipenv::

pipenv install --dev
pipenv run pytest

For the last two, 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::

# Make sure the tests can access github
if [ "$SSH_AGENT_PID" = "" ]
then
eval `ssh-agent`
ssh-add
fi

# Use unix like utilities, installed with brew,
# e.g. brew install coreutils
for d in /usr/local/opt/*/libexec/gnubin /usr/local/opt/python/libexec/bin
do
[[ ":$PATH:" != *":$d:"* ]] && PATH="$d:${PATH}"
done

export PATH

# PIP_FIND_LINKS currently breaks test_uninstall.py
unset PIP_FIND_LINKS

0 comments on commit 36d3847

Please sign in to comment.