Skip to content
This repository has been archived by the owner on Jan 29, 2025. It is now read-only.

Commit

Permalink
Merge #2276
Browse files Browse the repository at this point in the history
2276: Update to Python 3.9 r=rehandalal a=mythmon



Co-authored-by: Mike Cooper <[email protected]>
  • Loading branch information
bors[bot] and mythmon authored Oct 28, 2020
2 parents 3d36309 + d5579fe commit 7cfa0b5
Show file tree
Hide file tree
Showing 7 changed files with 298 additions and 284 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
docs-build:
docker:
- image: circleci/python:3.7
- image: circleci/python:3.9
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:

python-tests:
docker:
- image: circleci/python:3.7-node-browsers
- image: circleci/python:3.9-node-browsers
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
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.7-slim@sha256:1689dea3fe5e2f230c3b2d0cc18b64e96f8214082c78792c67dbc1bda9b6c67c
FROM python:3.9-slim
WORKDIR /app
RUN groupadd --gid 10001 app && useradd -g app --uid 10001 --shell /usr/sbin/nologin app
RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-slim@sha256:1689dea3fe5e2f230c3b2d0cc18b64e96f8214082c78792c67dbc1bda9b6c67c
FROM python:3.9-slim
WORKDIR /app

RUN apt-get update && \
Expand Down
3 changes: 1 addition & 2 deletions docs/dev/api-tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Before running these tests you will need the following installed:

* Docker (https://docker.com)
* The `make` CLI tool
* Python 3.7.0 or greater
* Python 3.9
* `Poetry <https://python-poetry.org/docs/>`_ installed

Before running these tests you need to setup up an environment for the
Expand Down Expand Up @@ -57,4 +57,3 @@ from the root project directory.
where ``<server>`` is the server you want to test, such as
``https://stage.normandy.cloudops.mozgcp.net`` or `https://localhost:8000`.

4 changes: 2 additions & 2 deletions docs/dev/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Prerequisites
This guide assumes you have already installed and set up the following:

1. Git_
2. `Python 3.7`_, and `Poetry`_
2. `Python 3.9`_, and `Poetry`_
3. `Node.js 8`_ and NPM 5 or higher
4. `Postgres 9.4`_
5. ``openssl``
Expand All @@ -18,7 +18,7 @@ theory, run on Windows as well. All the example commands given below are
intended to be run in a terminal.

.. _Git: https://git-scm.com/
.. _Python 3.7: https://www.python.org/
.. _Python 3.9: https://www.python.org/
.. _pip 8: https://pip.pypa.io/en/stable/
.. _Node.js 8: https://nodejs.org/en/
.. _virtualenv: https://virtualenv.pypa.io/en/latest/
Expand Down
Loading

0 comments on commit 7cfa0b5

Please sign in to comment.