Merge pull request readthedocs#7421 from readthedocs/humitos/ubuntu-20.04

Author: humitos

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   tests:
     docker:
-      - image: 'cimg/python:3.6'
+      - image: 'cimg/python:3.8'
         environment:
           TOX_POSARGS: ''
       - image: 'docker.elastic.co/elasticsearch/elasticsearch:7.14.0'
@@ -19,7 +19,7 @@ jobs:
 
   tests-embedapi:
     docker:
-      - image: 'cimg/python:3.6'
+      - image: 'cimg/python:3.8'
     steps:
       - checkout
       - run: git submodule sync
@@ -29,7 +29,7 @@ jobs:
 
   checks:
     docker:
-      - image: 'cimg/python:3.6'
+      - image: 'cimg/python:3.8'
         environment:
           NODE_VERSION: 10.17.0
     steps:

dockerfiles/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ARG GITHUB_TOKEN
 

docs/development/docs.rst

@@ -31,14 +31,14 @@ you may want to verify those changes locally before pushing upstream.
 
       $ git clone --recurse-submodules https://github.com/readthedocs/readthedocs.org/
 
-#. create a virtual environment with Python 3.6
-   (preferably the latest release, 3.6.15 at the time of writing),
+#. create a virtual environment with Python 3.8
+   (preferably the latest release, 3.8.12 at the time of writing),
    activate it, and upgrade both pip and setuptools:
 
    .. code-block:: console
 
       $ cd readthedocs.org
-      $ python3.6 -m venv .venv
+      $ python3.8 -m venv .venv
       $ source .venv/bin/activate
       (.venv) $ python -m pip install -U pip setuptools
 

docs/development/install.rst

@@ -142,7 +142,7 @@ save some work while typing docker compose commands. This section explains these
 ``inv docker.test``
     Runs all the test suites inside the container.
 
-    * ``--arguments`` will pass arguments to Tox command (e.g. ``--arguments "-e py36 -- -k test_api"``)
+    * ``--arguments`` will pass arguments to Tox command (e.g. ``--arguments "-e py38 -- -k test_api"``)
 
 ``inv docker.pull``
     Downloads and tags all the Docker images required for builders.

docs/development/tests.rst

@@ -46,13 +46,13 @@ To target a specific environment:
 
 .. prompt:: bash
 
-    tox -e py36
+    tox -e py38
 
 The ``tox`` configuration has the following environments configured. You can
 target a single environment to limit the test suite:
 
-py36
-    Run our test suite using Python 3.6
+py38
+    Run our test suite using Python 3.8
 
 lint
     Run code linting using `Prospector`_. This currently runs `pylint`_,

requirements/pip.txt

@@ -57,8 +57,7 @@ pyquery==1.4.3
 # NOTE: this dep can be removed in python 3.7 in favor of ``date.fromisoformat``
 python-dateutil==2.8.2
 
-# Version 3.6.3 is not available for Python 3.6
-orjson==3.6.1  # pyup: ignore
+orjson==3.6.3
 
 # Utils
 django-gravatar2==1.4.4

requirements/testing.txt

@@ -11,13 +11,7 @@ pytest-cov==2.12.1
 apipkg==2.0.0
 execnet==1.9.0
 
-# Mercurial 4.3 and newer require Python 2.7
-# Mercurial is actively being ported to Python 3. As of Mercurial 4.3,
-# some commands work on Python 3. However, Python 3 is not yet a
-# supported platform.
-# mercurial-scm.org/wiki/SupportedPythonVersions
-# (Pinned to 4.4.2 since what we need for testing is still useful)
-Mercurial==4.4.2  # pyup: ignore
+Mercurial==5.5
 
 yamale==2.2.0  # pyup: <3.0
 pytest-mock==3.6.1

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion=2.9.0
-envlist = py36,lint,docs
+envlist = py38,lint,docs
 skipsdist = True
 
 [testenv]
@@ -15,7 +15,7 @@ passenv = CI TRAVIS TRAVIS_* HOME
 deps = -r{toxinidir}/requirements/testing.txt
 changedir = {toxinidir}/readthedocs
 basepython =
-    python3.6
+    python3.8
 commands =
     /bin/sh -c '\
         export DJANGO_SETTINGS_MODULE=readthedocs.settings.test; \