Merge pull request #623 from tulibraries/DEVO-478-update-circleci-image

DEVO-478 Update circleci image

Author: sensei100

.circleci/config.yml

@@ -4,21 +4,20 @@ jobs:
   lint_and_test:
     working_directory: ~/cob_datapipeline
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.7.11
         environment:
           PIPENV_VENV_IN_PROJECT: true
     steps:
       - checkout
       - run:
           name: 'Run Pylint & Pytest'
           command: |
-            sudo pip install pipenv
             SLUGIFY_USES_TEXT_UNIDECODE=yes pipenv install --dev
             make lint
             make test
   qa_deploy:
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.7.11
         environment:
           PIPENV_VENV_IN_PROJECT: true
     steps:
@@ -32,15 +31,14 @@ jobs:
             cd ..
             git clone --single-branch --branch qa https://github.com/tulibraries/ansible-playbook-airflow.git
             cd ansible-playbook-airflow
-            sudo pip install pipenv
             pipenv install
             pipenv run ansible-galaxy install -r requirements.yml
             cp .circleci/.vault ~/.vault;
             chmod +x ~/.vault
             pipenv run ansible-playbook -i inventory/qa playbook.yml --tags "jumphost,role::airflow::dags" --vault-password-file=~/.vault -e 'ansible_ssh_port=9229'
   prod_deploy:
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.7.11
         environment:
           PIPENV_VENV_IN_PROJECT: true
     steps:
@@ -54,7 +52,6 @@ jobs:
             cd ..
             git clone --single-branch --branch main https://github.com/tulibraries/ansible-playbook-airflow.git
             cd ansible-playbook-airflow
-            sudo pip install pipenv
             pipenv install
             pipenv run ansible-galaxy install -r requirements.yml
             cp .circleci/.vault ~/.vault;

.python-version

@@ -1 +1 @@
-3.6.8
+3.7.11

Pipfile

@@ -22,10 +22,13 @@ cryptography = "==3.3.2"
 sqlalchemy = "==1.3.23"
 flask-openid = "==1.3.0"
 flask-sqlalchemy = "==2.4.4"
+jinja2 = "==2.11.3"
 werkzeug = "==0.16.1"
+marshmallow = "==2.21.0"
+wtforms = "==2.3.3"
 
 [packages]
 pytest = "==6.2.4"
 
 [requires]
-python_version = "3.6"
+python_version = "3.7"