From 3ba65903eec6014407cbe906c979cd77aefad919 Mon Sep 17 00:00:00 2001
From: Francois Lannoy <flannoy154@gmail.com>
Date: Tue, 5 Jan 2021 18:55:13 +0100
Subject: [PATCH] :construction_worker: added env vars and venv

---
 .circleci/config.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23a3836..8d76569 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
     steps: 
       - checkout
       - restore_cache:
-          key: deps9-{{ checksum "Pipfile.lock" }}
+          key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }}
       - run: 
           name: set env vars
           command: | 
@@ -17,32 +17,34 @@ jobs:
       - run : 
           name: install deps
           command: |
-            /usr/local/bin/python -m pip install --upgrade pip
-            apk update && apk add postgresql-dev gcc python3-dev musl-dev
-            pip install -r requirements/dev.txt --user
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -r requirements/dev.txt
       - save_cache:
-          key: deps9-{{ checksum "Pipfile.lock" }}
+          key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }}
           paths:
-            - "/usr/local/bin"
-            - "/usr/local/lib/python3.8/site-packages"
+            - "venv"
   test:
     docker: 
       - image: python:3.8-buster
+      - image: circleci/postgres:9.6.2-alpine
+        environment:
+          POSTGRES_USER: $POSTGRES_USER
+          POSTGRES_DB: psdb
+          POSTGRES_PASSWORD: $POSTGRES_PASSWORD
     steps:
       - checkout
       - restore_cache:
           key: deps9-{{ checksum "Pipfile.lock" }}
+      - run: 
+          name: postgres
+          command : dockerize -wait tcp://localhost:5432 -timeout 1m
       - run:
           name : test
           command: |
-            docker container run --name flask_db_test -e POSTGRES_PASSWORD=somePwd -e POSTGRES_USER=myUsr -p 5432:5432 -d postgres
-            sleep 1
-            export DATABASE_URL=postgresql://myUsr:somePwd@localhost:5432/myUsr
+            . venv/bin/activate
             flask db upgrade
             flask test
-            docker container stop flask_db_test
-            docker container rm flask_db_test
-            unset DATABASE_URL
 
 workflows:
   version: 2
@@ -50,5 +52,7 @@ workflows:
     jobs:
       - build 
       - test:
+          context:
+            - back_final
           requires: 
             - build
\ No newline at end of file