diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-09 10:58:54 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-09 10:58:54 +0000 |
| commit | d56e8b00f6566425089cc988f135018e31b99a91 (patch) | |
| tree | c38bbe88e9739ea5e845a103f8f78a347829f536 | |
| parent | 1a66012c6ad85d7a70da84189217bec231a6afdf (diff) | |
| parent | af013d34d98733554050a32282d82df0d340af62 (diff) | |
| download | gitlab-ce-d56e8b00f6566425089cc988f135018e31b99a91.tar.gz | |
Merge branch '52408-pip-cache-dir-to-cache-python-dependencies' into 'master'
Use the standard PIP_CACHE_DIR for Python dependency caching template
Closes #52408
See merge request gitlab-org/gitlab-ce!22211
| -rw-r--r-- | changelogs/unreleased/52408-pip-cache-dir-to-cache-python-dependencies.yml | 5 | ||||
| -rw-r--r-- | doc/ci/caching/index.md | 4 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Python.gitlab-ci.yml | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/52408-pip-cache-dir-to-cache-python-dependencies.yml b/changelogs/unreleased/52408-pip-cache-dir-to-cache-python-dependencies.yml new file mode 100644 index 00000000000..19d3e35c15c --- /dev/null +++ b/changelogs/unreleased/52408-pip-cache-dir-to-cache-python-dependencies.yml @@ -0,0 +1,5 @@ +--- +title: Use the standard PIP_CACHE_DIR for Python dependency caching template +merge_request: 22211 +author: Takuya Noguchi +type: fixed diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md index f479dc74d1f..758ab37861b 100644 --- a/doc/ci/caching/index.md +++ b/doc/ci/caching/index.md @@ -253,7 +253,7 @@ image: python:latest # Change pip's cache directory to be inside the project directory since we can # only cache local items. variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache" + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" # Pip's cache doesn't store the python packages # https://pip.pypa.io/en/stable/reference/pip_install/#caching @@ -262,7 +262,7 @@ variables: # them in a virtualenv and cache it as well. cache: paths: - - .cache/ + - .cache/pip - venv/ before_script: diff --git a/lib/gitlab/ci/templates/Python.gitlab-ci.yml b/lib/gitlab/ci/templates/Python.gitlab-ci.yml index 2e0589de652..098abe4daf5 100644 --- a/lib/gitlab/ci/templates/Python.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Python.gitlab-ci.yml @@ -5,7 +5,7 @@ image: python:latest # Change pip's cache directory to be inside the project directory since we can # only cache local items. variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache" + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" # Pip's cache doesn't store the python packages # https://pip.pypa.io/en/stable/reference/pip_install/#caching |