From af8c5b35e4ff4bc89a534b20831f0a30692f869f Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Sat, 30 May 2020 01:10:25 -0600
Subject: [PATCH] Fix cache dir; no cache on the deploy and verify deploy steps

---
 .gitlab-ci.yml               | 4 +++-
 cicd/install-project-deps.sh | 1 +
 setup.cfg                    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d877b03..088cdeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 
 cache:
   paths:
-    - .cache/pip
+    - .venv/
 
 image: registry.gitlab.com/sumner/sublime-music/python-build:latest
 
@@ -81,6 +81,7 @@ pages:
 deploy_pypi:
   image: python:3.8-alpine
   stage: deploy
+  cache: {}
   only:
     variables:
       # Only do a deploy if it's a version tag.
@@ -98,6 +99,7 @@ deploy_pypi:
 
 verify_deploy:
   stage: verify
+  cache: {}
   only:
     variables:
       # Only verify the deploy if it's a version tag.
diff --git a/cicd/install-project-deps.sh b/cicd/install-project-deps.sh
index cb340cc..d73f5c3 100755
--- a/cicd/install-project-deps.sh
+++ b/cicd/install-project-deps.sh
@@ -3,4 +3,5 @@ export PYENV_ROOT="${HOME}/.pyenv"
 export PATH="${PYENV_ROOT}/bin:$PATH"
 eval "$(pyenv init -)"
 
+export PIPENV_VENV_IN_PROJECT=1
 pipenv install --dev
diff --git a/setup.cfg b/setup.cfg
index 7598b92..b2dd275 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [flake8]
 extend-ignore = E203, E402, E722, W503, ANN002, ANN003, ANN101, ANN102, ANN204
-exclude = .git,__pycache__,build,dist,flatpak
+exclude = .git,__pycache__,build,dist,flatpak,.venv
 max-line-length = 88
 suppress-none-returning = True
 suppress-dummy-args = True