Skip to content

Commit

Permalink
Drop Python 3.6, default to running on 3.10
Browse files Browse the repository at this point in the history
Python 3.6 is well beyond end-of-life (December 2021). While 3.7
is still supported, it doesn't have long left (mid 2023). We should
therefore still support using it, but there's no compelling reason
to default to it.
  • Loading branch information
PeterJCLaw committed Sep 24, 2022
1 parent a1b114d commit 8186c17
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
26 changes: 5 additions & 21 deletions .circleci/config.yml
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 @@ -181,7 +170,7 @@ jobs:
typecheck:
working_directory: ~/routemaster
docker:
- image: cimg/python:3.6
- image: cimg/python:3.7
steps:
- checkout

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
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
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

0 comments on commit 8186c17

Please sign in to comment.