This commit is contained in:
Rob Hudson 2024-09-16 12:12:44 -07:00 коммит произвёл Rob Hudson
Родитель 2179c6e780
Коммит c3d5e200d0
5 изменённых файлов: 16 добавлений и 16 удалений

2
.github/workflows/fluent_linter.yml поставляемый
Просмотреть файл

@ -26,7 +26,7 @@ jobs:
- name: Set up Python 3
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
- name: Install Python dependencies
run: |
pip install moz-fluent-linter==0.4.*

2
.github/workflows/pull_request_tests.yml поставляемый
Просмотреть файл

@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11" # matches current Python in production
python-version: "3.12" # matches current Python in production
- name: "Run Python tests (on Docker)"
run: |
make clean test-image

Просмотреть файл

@ -8,7 +8,7 @@ version: 2
build:
os: ubuntu-20.04
tools:
python: "3.11"
python: "3.12"
# Build documentation in the docs/ directory with Sphinx
sphinx:

Просмотреть файл

@ -1,7 +1,7 @@
########
# Python dependencies builder
#
FROM python:3.11-slim-bookworm AS python-builder
FROM python:3.12-slim-bookworm AS python-builder
WORKDIR /app
ENV LANG=C.UTF-8
@ -52,7 +52,7 @@ RUN npm run build --verbose
########
# django app container
#
FROM python:3.11-slim-bookworm AS app-base
FROM python:3.12-slim-bookworm AS app-base
# Extra python env
ENV PYTHONDONTWRITEBYTECODE=1

Просмотреть файл

@ -110,7 +110,7 @@ Local Installation
These instructions assume you have Python, pip, and NodeJS installed. If you don't have `pip` installed
(you probably do) you can install it with the instructions in `the pip docs <https://pip.pypa.io/en/stable/installing/>`_.
Bedrock currently uses Python 3.11.x. The recommended way to install and use that version is
Bedrock currently uses Python 3.12.x. The recommended way to install and use that version is
with `pyenv <https://github.com/pyenv/pyenv>`_ and to create a virtualenv using
`pyenv-virtualenv <https://github.com/pyenv/pyenv-virtualenv>`_ that will isolate Bedrock's
dependencies from other things installed on the system.
@ -119,7 +119,7 @@ The following assumes you are on MacOS, using ``zsh`` as your shell and `Homebre
as your package manager. If you are not, there are installation instructions for a variety of
platforms and shells in the READMEs for the two pyenv projects.
**Install Python 3.11.x with pyenv**
**Install Python 3.12.x with pyenv**
1. Install ``pyenv`` itself ::
@ -138,23 +138,23 @@ using ``zsh``, the ``pyenv`` docs have other routes ::
$ zsh -l
4. Install the latest Python 3.11.x (e.g. 3.11.8), then test it's there::
4. Install the latest Python 3.12.x (e.g. 3.12.6), then test it's there::
$ pyenv install 3.11.8
$ pyenv install 3.12.6
If you'd like to make Python 3.11 your default globally, you can do so with::
If you'd like to make Python 3.12 your default globally, you can do so with::
$ pyenv global 3.11.8
$ pyenv global 3.12.6
If you only want to make Python 3.11 available in the current shell, while you set up the
If you only want to make Python 3.12 available in the current shell, while you set up the
Python virtualenv (below), you can do so with::
$ pyenv shell 3.11.8
$ pyenv shell 3.12.6
5. Verify that you have the correct version of Python installed::
$ python --version
Python 3.11.8
Python 3.12.6
**Install a plugin to manage virtualenvs via pyenv and create a virtualenv for Bedrock's dependencies**
@ -176,7 +176,7 @@ pyenv-virtualenv installed::
4. Make a virtualenv we can use - in this example we'll call it ``bedrock`` but use whatever you want ::
$ pyenv virtualenv 3.11.8 bedrock
$ pyenv virtualenv 3.12.6 bedrock
**Use the virtualenv**
@ -201,7 +201,7 @@ deactivate it when you exit the directory, you can do so with::
If you are on OSX and some of the compiled dependencies fails to compile, try explicitly setting
the arch flags and try again. The following are relevant to Intel Macs only. If you're on Apple
Silicon, 3.11.8 should 'just work':
Silicon, 3.12.6 should 'just work':
.. code-block:: bash