From 3493f53c5cfa25ba5d3278215b3d57bcf7a8dabf Mon Sep 17 00:00:00 2001 From: s-pace Date: Wed, 17 Apr 2019 11:44:38 +0200 Subject: [PATCH 01/11] feat: add search to the main introduction page --- docs/_templates/sidebarintro.html | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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.

From cd13852fca562cc408851c264a968157760ae78d Mon Sep 17 00:00:00 2001 From: s-pace Date: Wed, 17 Apr 2019 11:45:20 +0200 Subject: [PATCH 02/11] feat: add search to every documentation pages --- docs/_templates/sidebarlogo.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) 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. From 55f49d55f893f70e31bc4101bb1ec090515e2e89 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 21 Apr 2019 09:05:21 -0400 Subject: [PATCH 03/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c6b6fb7d..5b27a49c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ONBUILD COPY Pipfile Pipfile ONBUILD COPY Pipfile.lock Pipfile.lock # -- Install dependencies: -ONBUILD RUN set -ex && pipenv install --deploy --system +ONBUILD RUN set -ex && pipenv install --deploy --system --sequential # -------------------- # - Using This File: - From ab12b4b83e3052250565936e39d9b41929b6c768 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 21 Apr 2019 14:16:43 -0400 Subject: [PATCH 04/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5b27a49c..c6b6fb7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ONBUILD COPY Pipfile Pipfile ONBUILD COPY Pipfile.lock Pipfile.lock # -- Install dependencies: -ONBUILD RUN set -ex && pipenv install --deploy --system --sequential +ONBUILD RUN set -ex && pipenv install --deploy --system # -------------------- # - Using This File: - From 1ef7b1373d1f669966f7133474431c142dd2cd6c Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 21 Apr 2019 14:22:44 -0400 Subject: [PATCH 05/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c6b6fb7d..7f84dc12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 # -- 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. From 0414287af361d8bb4a8e4a157e34a9ef571824d1 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 22 Apr 2019 08:15:36 -0400 Subject: [PATCH 06/11] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7f84dc12..0aae379c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ 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 libffi-dev -y From 459c678e61560daed09db32711817b1feebb528a Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Mon, 22 Apr 2019 15:10:00 -0700 Subject: [PATCH 07/11] Add installation instructions for Debian Buster+ in README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9c6fd39a..2fe92ce9 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 From 2d23ce5fce4a0cde2bb6cda8eb32a56d7b62ea64 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Mon, 22 Apr 2019 15:14:38 -0700 Subject: [PATCH 08/11] Add changelog for 3711. --- news/3711.trivial.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/3711.trivial.rst 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 From bddcde3bfbba04612f2a1b4244c6f0ce557826f7 Mon Sep 17 00:00:00 2001 From: Alexandre Morignot Date: Fri, 26 Apr 2019 11:28:32 +0200 Subject: [PATCH 09/11] Fix documentation install page link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fe92ce9..74067d58 100644 --- a/README.md +++ b/README.md @@ -58,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. ✨🍰✨ From 6cf692d28486ef167436b62f0fce215a2dcaf39a Mon Sep 17 00:00:00 2001 From: Greg Kaleka Date: Fri, 26 Apr 2019 09:13:41 -0700 Subject: [PATCH 10/11] Fix broken documentation links in CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From 615219975288c1c6dace4da2b1c6b85e429b4fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 3 May 2019 12:18:03 +0200 Subject: [PATCH 11/11] Pytest 4: Update to get_closest_marker See https://docs.pytest.org/en/latest/mark.html#update-marker-code --- news/3724.trivial.rst | 1 + tests/integration/conftest.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 news/3724.trivial.rst 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 766291e8..a687abb7 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')