Skip to content

Commit

Permalink
Merge pull request #19 from bluelabsio/ryantimjohn-fix-circle-ci-config
Browse files Browse the repository at this point in the history
Fix CircleCI config
  • Loading branch information
ryantimjohn authored Jun 5, 2023
2 parents 30084e1 + 190c265 commit be82055
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 36 deletions.
37 changes: 5 additions & 32 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ commands:
type: string
steps:
- restore_cache:
key: deps-v1-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
key: deps-v2-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
- run:
name: Install python deps in venv
command: |
Expand All @@ -30,7 +30,7 @@ commands:
# '-e .' installation.
pip install --progress-bar=off -e .
- save_cache:
key: deps-v1-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
key: deps-v2-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
paths:
- "venv"

Expand All @@ -48,7 +48,7 @@ jobs:
default: false
description: "Enforce coverage not slipping"
docker:
- image: circleci/python:<<parameters.python_version>>
- image: cimg/python:<<parameters.python_version>>
steps:
- checkout
- installvenv:
Expand Down Expand Up @@ -78,9 +78,9 @@ jobs:
python_version:
type: string
description: "Version of python to test against"
default: '3.6'
default: '3.8'
docker:
- image: circleci/python:<<parameters.python_version>>
- image: cimg/python:<<parameters.python_version>>
steps:
- checkout
- installvenv:
Expand Down Expand Up @@ -125,30 +125,6 @@ workflows:
# We try to test against all non-end-of-life Python versions:
#
# https://devguide.python.org/devcycle/#end-of-life-branches
- test:
name: test-3.5
python_version: "3.5"
requires:
- test-3.8
filters:
tags:
only: /v\d+\.\d+\.\d+(-[\w]+)?/
- test:
name: test-3.6
python_version: "3.6"
requires:
- test-3.8
filters:
tags:
only: /v\d+\.\d+\.\d+(-[\w]+)?/
- test:
name: test-3.7
python_version: "3.7"
requires:
- test-3.8
filters:
tags:
only: /v\d+\.\d+\.\d+(-[\w]+)?/
- test:
name: test-3.8
python_version: "3.8"
Expand All @@ -159,9 +135,6 @@ workflows:
- deploy:
context: PyPI
requires:
- test-3.5
- test-3.6
- test-3.7
- test-3.8
filters:
tags:
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sqlalchemy-vertica-python-3.8.5
3.8.16
2 changes: 1 addition & 1 deletion metrics/bigfiles_high_water_mark
Original file line number Diff line number Diff line change
@@ -1 +1 @@
548
551
2 changes: 1 addition & 1 deletion metrics/coverage_high_water_mark
Original file line number Diff line number Diff line change
@@ -1 +1 @@
29.2700
30.1200
2 changes: 1 addition & 1 deletion metrics/flake8_high_water_mark
Original file line number Diff line number Diff line change
@@ -1 +1 @@
32
33

0 comments on commit be82055

Please sign in to comment.