Skip to content

Commit f48aea2

Browse files
committed
Drop Python 3.6, default to running on 3.10
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.
1 parent a1b114d commit f48aea2

File tree

3 files changed

+6
-22
lines changed

3 files changed

+6
-22
lines changed

.circleci/config.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ references:
1515
PG_DB: routemaster
1616
PG_USER: routemaster
1717
PG_PASS: routemaster
18-
TOXENV: py36
18+
TOXENV: py37
1919
COVERALLS: true
2020

2121
# Set up a cached virtualenv in which to install our CI dependencies
@@ -96,17 +96,6 @@ references:
9696
coveralls
9797
9898
jobs:
99-
test-36:
100-
<<: *test-template
101-
docker:
102-
- image: cimg/python:3.6
103-
environment:
104-
<<: *steps-environment
105-
TOXENV: py36
106-
COVERALLS: true
107-
108-
- *postgres-container
109-
11099
test-37:
111100
<<: *test-template
112101
docker:
@@ -154,7 +143,7 @@ jobs:
154143
lint:
155144
working_directory: ~/routemaster
156145
docker:
157-
- image: cimg/python:3.6
146+
- image: cimg/python:3.7
158147
steps:
159148
- checkout
160149

@@ -181,7 +170,7 @@ jobs:
181170
typecheck:
182171
working_directory: ~/routemaster
183172
docker:
184-
- image: cimg/python:3.6
173+
- image: cimg/python:3.7
185174
steps:
186175
- checkout
187176

@@ -208,7 +197,7 @@ jobs:
208197
release:
209198
working_directory: ~/routemaster
210199
docker:
211-
- image: cimg/python:3.6
200+
- image: cimg/python:3.7
212201
steps:
213202
- checkout
214203

@@ -275,10 +264,6 @@ workflows:
275264
version: 2
276265
build-release:
277266
jobs:
278-
- test-36:
279-
filters:
280-
tags:
281-
only: /.*/
282267
- test-37:
283268
filters:
284269
tags:
@@ -305,7 +290,6 @@ workflows:
305290
only: /.*/
306291
- release:
307292
requires:
308-
- test-36
309293
- test-37
310294
- test-38
311295
- test-39

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-stretch
1+
FROM python:3.10-bullseye
22

33
ENV PYTHONUNBUFFERED 1
44

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py36,py37,py38,py39,py310,mypy,lint
2+
envlist = py37,py38,py39,py310,mypy,lint
33

44
[testenv]
55
deps =

0 commit comments

Comments
 (0)