Merge branch 'current' into next

This commit is contained in:
Jesse Hills 2021-07-15 07:44:56 +12:00
commit d7ee83cac5
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
3 changed files with 9 additions and 4 deletions

View File

@ -1,4 +1,4 @@
FROM python:slim FROM python:3.8-slim
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
curl \ curl \
@ -9,8 +9,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common \ software-properties-common \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*
RUN pip3 install --no-cache-dir --no-binary :all: \ COPY requirements.txt .
sphinx RUN pip3 install --no-cache-dir --no-binary :all: -r requirements.txt
EXPOSE 8000 EXPOSE 8000
WORKDIR /data/esphomedocs WORKDIR /data/esphomedocs

View File

@ -16,6 +16,11 @@ Installing ESPHome is very easy. All you need to do is have `Python
<https://www.python.org/>`__ installed and install the console script through <https://www.python.org/>`__ installed and install the console script through
``pip3``. ``pip3``.
.. note::
Python 3.7 or above is required to install ESPHome 1.18.0 or above.
.. code-block:: bash .. code-block:: bash
pip3 install esphome pip3 install esphome

View File

@ -1 +1 @@
sphinx>=1.8.4 sphinx==4.0.3