diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e3ef65c..03c1825e 100644 --- a/CONTRIBUTING.md +++ b/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. diff --git a/Dockerfile b/Dockerfile index c6b6fb7d..0aae379c 100644 --- a/Dockerfile +++ b/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. diff --git a/README.md b/README.md index 9c6fd39a..74067d58 100644 --- a/README.md +++ b/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. ✨🍰✨ diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html index 23b91e7e..8390940e 100644 --- a/docs/_templates/sidebarintro.html +++ b/docs/_templates/sidebarintro.html @@ -8,12 +8,32 @@

+ + + +

Pipenv 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.

It features very pretty terminal colors.

-

Stay Informed

Receive updates on new releases and upcoming projects.

diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html index 5107e4de..00fb20c4 100644 --- a/docs/_templates/sidebarlogo.html +++ b/docs/_templates/sidebarlogo.html @@ -8,6 +8,27 @@

+ + + +

Pipenv 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. diff --git a/news/3711.trivial.rst b/news/3711.trivial.rst new file mode 100644 index 00000000..48c531b2 --- /dev/null +++ b/news/3711.trivial.rst @@ -0,0 +1 @@ +Add installation instructions for Debian Buster+ in README diff --git a/news/3724.trivial.rst b/news/3724.trivial.rst new file mode 100644 index 00000000..63a55013 --- /dev/null +++ b/news/3724.trivial.rst @@ -0,0 +1 @@ +Update pytest configuration to support pytest 4. diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index f204cca3..1fff03ab 100644 --- a/tests/integration/conftest.py +++ b/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')