From c0a763f788abcd7cad3127178b234e4a897a76ec Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 13 Feb 2020 13:56:01 +0100 Subject: [PATCH 1/3] Upgrade readme with new docker images --- README.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index bb25c90..cd83e33 100644 --- a/README.rst +++ b/README.rst @@ -21,16 +21,20 @@ repository: Ubuntu 16.04 based image. `readthedocs/build:4.0` - ``stable`` + **Deprecated** Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7. - This is the **stable** image supported by Read the Docs. `readthedocs/build:5.0` - ``latest`` + ``stable`` Ubuntu 18.04 supporting Python 2.7, 3.6, 3.7 and pypy3.5-7.0.0. + This is the **stable** image supported by Read the Docs. + +`readthedocs/build:6.0` + ``latest`` + Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0. This is the **latest** default image used for documentation builds and supported by Read the Docs. -`readthedocs/build:6.0rc1` +`readthedocs/build:testing` Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0. For internal development **testing** only, not available for public usage yet. From 782a7e6aca69c6709bc997a42e7455cc235120e0 Mon Sep 17 00:00:00 2001 From: Eric Holscher <25510+ericholscher@users.noreply.github.com> Date: Mon, 17 Feb 2020 12:43:51 -0800 Subject: [PATCH 2/3] Update 7.0/testing --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index cd83e33..0272efe 100644 --- a/README.rst +++ b/README.rst @@ -34,7 +34,8 @@ repository: Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0. This is the **latest** default image used for documentation builds and supported by Read the Docs. -`readthedocs/build:testing` +`readthedocs/build:7.0` + ``testing`` Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0. For internal development **testing** only, not available for public usage yet. From 3b565a366a441d410b252846efdc4680b955d34e Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Mon, 17 Feb 2020 13:24:48 -0800 Subject: [PATCH 3/3] Update CONTRIBUTING to not be lies --- CONTRIBUTING.rst | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 357f8da..a100e30 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -41,32 +41,8 @@ Releases -------- These images are all built from our `automated Docker Hub repository`_. The -automated build rules include pattern matching on Git tags. Here is how the -images are currently tagged: - -build:latest - This is the latest supported release. Currently, this is ``3.0``. - -build:stable - This is the previously supported release. Currently, this is ``2.0``. - -build:4.0rc1 - This is the next image being released, it will go through a testing cycle - before being considered a full release however. It is only a release - candidate currently, and is not useable on Read the Docs until full release. - This is the version built from ``master`` currently. - -build:3.0 - From any tag matching ``3.0[0-9.]*``. These tags should only represent - commits to the ``releases/3.x`` branch. - -build:2.0 - From any tag matching ``2.0[0-9.]*``. These tags should only represent - commits to the ``releases/2.x`` branch. - -build:1.0 - From the ``1.0`` tag. These tags should only represent commits to the - ``releases/1.x`` branch. +automated build rules include pattern matching on Git tags. The current tags +are defined in the :doc:`README`. We follow `semantic versioning`_, but drop the bug fix level version number for our images, as this level of granularity is not important for any application of