Corrected version numbering; simplified versioning language

Shiwanee · May 14, 2020 · faa9e27 · faa9e27
1 parent b7239ca
commit faa9e27
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 148 deletions.
diff --git a/v19.2/build-a-python-app-with-cockroachdb-django.md b/v19.2/build-a-python-app-with-cockroachdb-django.md
@@ -19,7 +19,7 @@ twitter: false
 
 This tutorial shows you how build a simple Python application with CockroachDB and the [Django](https://www.djangoproject.com/) framework.
 
-CockroachDB supports Django versions 2 and 3.
+CockroachDB supports Django versions 2.2 and 3.0.
 
 {% unless site.cockroachcloud %}
 
@@ -30,7 +30,7 @@ CockroachDB supports Django versions 2 and 3.
 {% endunless %}
 
 {{site.data.alerts.callout_info}}
-The example code and instructions on this page use Python 3 and Django 3.
+The example code and instructions on this page use Python 3 and Django 3.0.
 {{site.data.alerts.end}}
 
 ## Step 1. Install Django and the CockroachDB backend for Django
@@ -39,50 +39,16 @@ Install [Django](https://docs.djangoproject.com/en/3.0/topics/install/) and the
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django
+$ python3 -m pip install django==3.0.*
 ~~~
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django-cockroachdb
+$ python3 -m pip install django-cockroachdb==3.0.*
 ~~~
 
-These commands download and install the latest stable minor release of `django` and `django-cockroachdb`. At the time of writing this tutorial, the latest stable minor release of each module was 3.0.
-
 {{site.data.alerts.callout_info}}
 The major version of `django-cockroachdb` must correspond to the major version of `django`. The minor release numbers do not need to match.
-
-For example, if you install the latest minor release of `django` 2:
-
-~~~ shell
-$ python3 -m pip install django==2.*
-~~~
-
-You can also install the latest minor release of `django-cockroachdb` 2:
-
-~~~ sql
-python3 -m pip install django-cockroachdb==2.**
-~~~
-{{site.data.alerts.end}}
-
-{{site.data.alerts.callout_success}}
-If alpha or beta releases exist for a version of `django-cockroachdb`, you might encounter an error when attempting to install the latest release of that version. To resolve this issue, specify the exact release that you want.
-
-For example, if `django-cockroachdb` 3.0 alpha 1 is available, and you want to install it, you could encounter an error:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0.*
-ERROR: Could not find a version that satisfies the requirement
-django-cockroachdb==3.0.* (from versions: 3.0a1)
-~~~
-
-Instead, use the following command:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0a1
-...
-Successfully installed django-cockroachdb-3.0a1 psycopg2-2.8.4
-~~~
 {{site.data.alerts.end}}
 
 {% unless site.cockroachcloud %}

diff --git a/v19.2/install-client-drivers.md b/v19.2/install-client-drivers.md
@@ -69,54 +69,22 @@ For a simple but complete "Hello World" example app, see [Build a Python App wit
 
 **Support level:** Full
 
+CockroachDB supports Django versions 2.2 and 3.0.
+
 To install [Django](https://docs.djangoproject.com/en/3.0/topics/install/) and the [CockroachDB backend for Django](https://github.com/cockroachdb/django-cockroachdb):
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django
+$ python3 -m pip install django==3.0.*
 ~~~
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django-cockroachdb
+$ python3 -m pip install django-cockroachdb==3.0.*
 ~~~
 
-These commands download and install the latest stable minor release of `django` and `django-cockroachdb`. At the time of writing this tutorial, the latest stable minor release of each module was 3.0.
-
 {{site.data.alerts.callout_info}}
 The major version of `django-cockroachdb` must correspond to the major version of `django`. The minor release numbers do not need to match.
-
-For example, if you install the latest minor release of `django` 2:
-
-~~~ shell
-$ python3 -m pip install django==2.*
-~~~
-
-You can also install the latest minor release of `django-cockroachdb` 2:
-
-~~~ sql
-python3 -m pip install django-cockroachdb==2.**
-~~~
-{{site.data.alerts.end}}
-
-{{site.data.alerts.callout_success}}
-If alpha or beta releases exist for a version of `django-cockroachdb`, you might encounter an error when attempting to install the latest release of that version. To resolve this issue, specify the exact release that you want.
-
-For example, if `django-cockroachdb` 3.0 alpha 1 is available, and you want to install it, you could encounter an error:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0.*
-ERROR: Could not find a version that satisfies the requirement
-django-cockroachdb==3.0.* (from versions: 3.0a1)
-~~~
-
-Instead, use the following command:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0a1
-...
-Successfully installed django-cockroachdb-3.0a1 psycopg2-2.8.4
-~~~
 {{site.data.alerts.end}}
 
 For a simple but complete "Hello World" example app, see [Build a Python App with CockroachDB and Django](build-a-python-app-with-cockroachdb-django.html).

diff --git a/v20.1/build-a-python-app-with-cockroachdb-django.md b/v20.1/build-a-python-app-with-cockroachdb-django.md
@@ -20,7 +20,7 @@ build_for: [cockroachdb, cockroachcloud]
 
 This tutorial shows you how build a simple Python application with CockroachDB and the [Django](https://www.djangoproject.com/) framework.
 
-CockroachDB supports Django versions 2 and 3.
+CockroachDB supports Django versions 2.2 and 3.0.
 
 {% unless site.cockroachcloud %}
 
@@ -31,7 +31,7 @@ CockroachDB supports Django versions 2 and 3.
 {% endunless %}
 
 {{site.data.alerts.callout_info}}
-The example code and instructions on this page use Python 3 and Django 3.
+The example code and instructions on this page use Python 3 and Django 3.0.
 {{site.data.alerts.end}}
 
 ## Step 1. Install Django and the CockroachDB backend for Django
@@ -40,50 +40,16 @@ Install [Django](https://docs.djangoproject.com/en/3.0/topics/install/) and the
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django
+$ python3 -m pip install django==3.0.*
 ~~~
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django-cockroachdb
+$ python3 -m pip install django-cockroachdb==3.0.*
 ~~~
 
-These commands download and install the latest stable minor release of `django` and `django-cockroachdb`. At the time of writing this tutorial, the latest stable minor release of each module was 3.0.
-
 {{site.data.alerts.callout_info}}
 The major version of `django-cockroachdb` must correspond to the major version of `django`. The minor release numbers do not need to match.
-
-For example, if you install the latest minor release of `django` 2:
-
-~~~ shell
-$ python3 -m pip install django==2.*
-~~~
-
-You can also install the latest minor release of `django-cockroachdb` 2:
-
-~~~ sql
-python3 -m pip install django-cockroachdb==2.**
-~~~
-{{site.data.alerts.end}}
-
-{{site.data.alerts.callout_success}}
-If alpha or beta releases exist for a version of `django-cockroachdb`, you might encounter an error when attempting to install the latest release of that version. To resolve this issue, specify the exact release that you want.
-
-For example, if `django-cockroachdb` 3.0 alpha 1 is available, and you want to install it, you could encounter an error:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0.*
-ERROR: Could not find a version that satisfies the requirement
-django-cockroachdb==3.0.* (from versions: 3.0a1)
-~~~
-
-Instead, use the following command:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0a1
-...
-Successfully installed django-cockroachdb-3.0a1 psycopg2-2.8.4
-~~~
 {{site.data.alerts.end}}
 
 {% unless site.cockroachcloud %}

diff --git a/v20.1/install-client-drivers.md b/v20.1/install-client-drivers.md
@@ -68,54 +68,22 @@ For a simple but complete "Hello World" example app, see [Build a Python App wit
 
 **Support level:** Full
 
+CockroachDB supports Django versions 2.2 and 3.0.
+
 To install [Django](https://docs.djangoproject.com/en/3.0/topics/install/) and the [CockroachDB backend for Django](https://github.com/cockroachdb/django-cockroachdb):
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django
+$ python3 -m pip install django==3.0.*
 ~~~
 
 {% include copy-clipboard.html %}
 ~~~ shell
-$ python3 -m pip install django-cockroachdb
+$ python3 -m pip install django-cockroachdb==3.0.*
 ~~~
 
-These commands download and install the latest stable minor release of `django` and `django-cockroachdb`. At the time of writing this tutorial, the latest stable minor release of each module was 3.0.
-
 {{site.data.alerts.callout_info}}
 The major version of `django-cockroachdb` must correspond to the major version of `django`. The minor release numbers do not need to match.
-
-For example, if you install the latest minor release of `django` 2:
-
-~~~ shell
-$ python3 -m pip install django==2.*
-~~~
-
-You can also install the latest minor release of `django-cockroachdb` 2:
-
-~~~ sql
-python3 -m pip install django-cockroachdb==2.**
-~~~
-{{site.data.alerts.end}}
-
-{{site.data.alerts.callout_success}}
-If alpha or beta releases exist for a version of `django-cockroachdb`, you might encounter an error when attempting to install the latest release of that version. To resolve this issue, specify the exact release that you want.
-
-For example, if `django-cockroachdb` 3.0 alpha 1 is available, and you want to install it, you could encounter an error:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0.*
-ERROR: Could not find a version that satisfies the requirement
-django-cockroachdb==3.0.* (from versions: 3.0a1)
-~~~
-
-Instead, use the following command:
-
-~~~ sql
-$ pip install django-cockroachdb==3.0a1
-...
-Successfully installed django-cockroachdb-3.0a1 psycopg2-2.8.4
-~~~
 {{site.data.alerts.end}}
 
 For a simple but complete "Hello World" example app, see [Build a Python App with CockroachDB and Django](build-a-python-app-with-cockroachdb-django.html).