Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Python 3.6, default to running on 3.10 #124

Draft
wants to merge 1 commit into
base: newer-circle-image
Choose a base branch
from
Draft

Drop Python 3.6, default to running on 3.10 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 9 additions & 25 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ references:
PG_DB: routemaster
PG_USER: routemaster
PG_PASS: routemaster
TOXENV: py36
TOXENV: py37
COVERALLS: true

# Set up a cached virtualenv in which to install our CI dependencies
Expand Down Expand Up @@ -96,17 +96,6 @@ references:
coveralls

jobs:
test-36:
<<: *test-template
docker:
- image: cimg/python:3.6
environment:
<<: *steps-environment
TOXENV: py36
COVERALLS: true

- *postgres-container

test-37:
<<: *test-template
docker:
Expand Down Expand Up @@ -147,14 +136,14 @@ jobs:
environment:
<<: *steps-environment
TOXENV: py310
COVERALLS: false
COVERALLS: true

- *postgres-container

lint:
working_directory: ~/routemaster
docker:
- image: cimg/python:3.6
- image: cimg/python:3.7
steps:
- checkout

Expand All @@ -164,15 +153,15 @@ jobs:

- restore_cache:
name: Restore .tox cache
key: deps-tox-1-{{ checksum "scripts/linting/requirements.txt" }}
key: deps-tox-2-{{ checksum "scripts/linting/requirements.txt" }}
- run:
name: Lint
command: |
. venv/bin/activate
TOXENV=lint tox
- save_cache:
name: Save .tox cache
key: deps-tox-1-{{ checksum "scripts/linting/requirements.txt" }}
key: deps-tox-2-{{ checksum "scripts/linting/requirements.txt" }}
paths:
- ".tox"
- store_test_results:
Expand All @@ -181,7 +170,7 @@ jobs:
typecheck:
working_directory: ~/routemaster
docker:
- image: cimg/python:3.6
- image: cimg/python:3.7
steps:
- checkout

Expand All @@ -191,15 +180,15 @@ jobs:

- restore_cache:
name: Restore .tox cache
key: deps-tox-1-{{ checksum "scripts/typechecking/requirements.txt" }}
key: deps-tox-2-{{ checksum "scripts/typechecking/requirements.txt" }}
- run:
name: Typecheck
command: |
. venv/bin/activate
TOXENV=mypy tox
- save_cache:
name: Save .tox cache
key: deps-tox-1-{{ checksum "scripts/typechecking/requirements.txt" }}
key: deps-tox-2-{{ checksum "scripts/typechecking/requirements.txt" }}
paths:
- ".tox"
- store_test_results:
Expand All @@ -208,7 +197,7 @@ jobs:
release:
working_directory: ~/routemaster
docker:
- image: cimg/python:3.6
- image: cimg/python:3.7
steps:
- checkout

Expand Down Expand Up @@ -275,10 +264,6 @@ workflows:
version: 2
build-release:
jobs:
- test-36:
filters:
tags:
only: /.*/
- test-37:
filters:
tags:
Expand All @@ -305,7 +290,6 @@ workflows:
only: /.*/
- release:
requires:
- test-36
- test-37
- test-38
- test-39
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6-stretch
FROM python:3.10-bullseye

ENV PYTHONUNBUFFERED 1

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38,py39,py310,mypy,lint
envlist = py37,py38,py39,py310,mypy,lint

[testenv]
deps =
Expand Down