Skip to content

Commit 160b57d

Browse files
committed
DEVO-478 Update circleci image
- Also updates python version
1 parent 3d64183 commit 160b57d

File tree

5 files changed

+360
-325
lines changed

5 files changed

+360
-325
lines changed

.circleci/config.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@ jobs:
44
lint_and_test:
55
working_directory: ~/cob_datapipeline
66
docker:
7-
- image: circleci/python:3.6
7+
- image: cimg/python:3.7.11
88
environment:
99
PIPENV_VENV_IN_PROJECT: true
1010
steps:
1111
- checkout
1212
- run:
1313
name: 'Run Pylint & Pytest'
1414
command: |
15-
sudo pip install pipenv
1615
SLUGIFY_USES_TEXT_UNIDECODE=yes pipenv install --dev
1716
make lint
1817
make test
1918
qa_deploy:
2019
docker:
21-
- image: circleci/python:3.6
20+
- image: cimg/python:3.7.11
2221
environment:
2322
PIPENV_VENV_IN_PROJECT: true
2423
steps:
@@ -32,15 +31,14 @@ jobs:
3231
cd ..
3332
git clone --single-branch --branch qa https://github.com/tulibraries/ansible-playbook-airflow.git
3433
cd ansible-playbook-airflow
35-
sudo pip install pipenv
3634
pipenv install
3735
pipenv run ansible-galaxy install -r requirements.yml
3836
cp .circleci/.vault ~/.vault;
3937
chmod +x ~/.vault
4038
pipenv run ansible-playbook -i inventory/qa playbook.yml --tags "jumphost,role::airflow::dags" --vault-password-file=~/.vault -e 'ansible_ssh_port=9229'
4139
prod_deploy:
4240
docker:
43-
- image: circleci/python:3.6
41+
- image: cimg/python:3.7.11
4442
environment:
4543
PIPENV_VENV_IN_PROJECT: true
4644
steps:
@@ -54,7 +52,6 @@ jobs:
5452
cd ..
5553
git clone --single-branch --branch main https://github.com/tulibraries/ansible-playbook-airflow.git
5654
cd ansible-playbook-airflow
57-
sudo pip install pipenv
5855
pipenv install
5956
pipenv run ansible-galaxy install -r requirements.yml
6057
cp .circleci/.vault ~/.vault;

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.8
1+
3.7.11

Pipfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ cryptography = "==3.3.2"
2222
sqlalchemy = "==1.3.23"
2323
flask-openid = "==1.3.0"
2424
flask-sqlalchemy = "==2.4.4"
25+
jinja2 = "==2.11.3"
2526
werkzeug = "==0.16.1"
2627

2728
[packages]
2829
pytest = "==6.2.4"
2930

3031
[requires]
31-
python_version = "3.6"
32+
python_version = "3.7"

0 commit comments

Comments
 (0)