diff mbox series

Remove Django 2.0 support

Message ID 20191029064721.6209-1-dja@axtens.net
State Accepted
Headers show
Series Remove Django 2.0 support | expand

Commit Message

Daniel Axtens Oct. 29, 2019, 6:47 a.m. UTC 
It's no longer supported upstream, per
https://www.djangoproject.com/download/#supported-versions

Signed-off-by: Daniel Axtens <dja@axtens.net>
---
 README.rst                                                 | 2 +-
 .../notes/remove-django-2-0-support-623b936d377a8e56.yaml  | 5 +++++
 tox.ini                                                    | 7 +++----
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml

Comments

Daniel Axtens Nov. 5, 2019, 12:17 a.m. UTC | #1 
Applied, with an adjusted release note. Distros might not ship a newer
version - if not, people who are committed to running distro versions
should run Django 1.11, which is still supported.

Daniel Axtens <dja@axtens.net> writes:

> It's no longer supported upstream, per
> https://www.djangoproject.com/download/#supported-versions
>
> Signed-off-by: Daniel Axtens <dja@axtens.net>
> ---
>  README.rst                                                 | 2 +-
>  .../notes/remove-django-2-0-support-623b936d377a8e56.yaml  | 5 +++++
>  tox.ini                                                    | 7 +++----
>  3 files changed, 9 insertions(+), 5 deletions(-)
>  create mode 100644 releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
>
> diff --git a/README.rst b/README.rst
> index 495cc2bd7862..f5fc1d1aba76 100644
> --- a/README.rst
> +++ b/README.rst
> @@ -39,7 +39,7 @@ Requirements
>  
>  - Python (2.7, 3.5 - 3.8)
>  
> -- Django (1.11 - 2.2)
> +- Django (1.11, 2.1 - 2.2)
>  
>  - Django REST Framework (3.6 - 3.9)
>  
> diff --git a/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> new file mode 100644
> index 000000000000..7513bbead6f8
> --- /dev/null
> +++ b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> @@ -0,0 +1,5 @@
> +---
> +upgrade:
> +  - |
> +    Django 2.0 is no longer supported. It is no longer supported upstream
> +    and most distributions provide a newer version.
> diff --git a/tox.ini b/tox.ini
> index 140c19246dd1..397a1c52745a 100644
> --- a/tox.ini
> +++ b/tox.ini
> @@ -1,6 +1,6 @@
>  [tox]
>  minversion = 2.0
> -envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22}
> +envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,21,22}
>  skipsdist = True
>  
>  [testenv]
> @@ -11,10 +11,9 @@ deps =
>      django111: djangorestframework>=3.6,<3.10; python_version < '3.0'
>      django111: django-filter>=1.0,<3.0; python_version >= '3.5'
>      django111: django-filter>=1.0,<2.0; python_version < '3.0'
> -    django20: django>=2.0,<2.1
>      django21: django>=2.1,<2.2
> -    django{20,21}: djangorestframework>=3.7,<3.11
> -    django{20,21}: django-filter>=2.0,<3.0
> +    django21: djangorestframework>=3.7,<3.11
> +    django21: django-filter>=2.0,<3.0
>      django22: django>=2.2,<2.3
>      django22: djangorestframework>=3.10,<3.11
>      django22: django-filter>=2.1,<3.0
> -- 
> 2.20.1
Stephen Finucane Nov. 5, 2019, 3:07 a.m. UTC | #2 
On Tue, 2019-10-29 at 17:47 +1100, Daniel Axtens wrote:
> It's no longer supported upstream, per
> https://www.djangoproject.com/download/#supported-versions
> 
> Signed-off-by: Daniel Axtens <dja@axtens.net>

Hmm, can we not do this until after we've release Patchwork 2.2 (I'll
be back from PTO/the OpenInfra Summit next week so then would work for
me)? (or rather revert the patch you've merged until we cut that).
Personally, given that we need to support Django 1.11 for another
while, it doesn't seem that helpful to drop support for an intermediate
release, aside from saving some CI resource. If not, we need to do some
more cleanup than you've done here. Notes below.

> ---
>  README.rst                                                 | 2 +-
>  .../notes/remove-django-2-0-support-623b936d377a8e56.yaml  | 5 +++++
>  tox.ini                                                    | 7 +++----
>  3 files changed, 9 insertions(+), 5 deletions(-)
>  create mode 100644 releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> 
> diff --git a/README.rst b/README.rst
> index 495cc2bd7862..f5fc1d1aba76 100644
> --- a/README.rst
> +++ b/README.rst
> @@ -39,7 +39,7 @@ Requirements
>  
>  - Python (2.7, 3.5 - 3.8)
>  
> -- Django (1.11 - 2.2)
> +- Django (1.11, 2.1 - 2.2)
>  
>  - Django REST Framework (3.6 - 3.9)
>  
> diff --git a/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> new file mode 100644
> index 000000000000..7513bbead6f8
> --- /dev/null
> +++ b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> @@ -0,0 +1,5 @@
> +---
> +upgrade:
> +  - |
> +    Django 2.0 is no longer supported. It is no longer supported upstream
> +    and most distributions provide a newer version.

This isn't correct. We haven't released a version with Django 2.0
support so the release note that states we've added support for this
will be included in the release notes for 2.2. i.e., our 2.2 release
notes will say:

  - Added support for Django 2.0
  ...
  - Removed support for Django 2.0

If you _really_ want to do this, you need to just drop both of these
release notes but, as noted above, for the sake of a week I'd revert
this patch.

Stephen

> diff --git a/tox.ini b/tox.ini
> index 140c19246dd1..397a1c52745a 100644
> --- a/tox.ini
> +++ b/tox.ini
> @@ -1,6 +1,6 @@
>  [tox]
>  minversion = 2.0
> -envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22}
> +envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,21,22}
>  skipsdist = True
>  
>  [testenv]
> @@ -11,10 +11,9 @@ deps =
>      django111: djangorestframework>=3.6,<3.10; python_version < '3.0'
>      django111: django-filter>=1.0,<3.0; python_version >= '3.5'
>      django111: django-filter>=1.0,<2.0; python_version < '3.0'
> -    django20: django>=2.0,<2.1
>      django21: django>=2.1,<2.2
> -    django{20,21}: djangorestframework>=3.7,<3.11
> -    django{20,21}: django-filter>=2.0,<3.0
> +    django21: djangorestframework>=3.7,<3.11
> +    django21: django-filter>=2.0,<3.0
>      django22: django>=2.2,<2.3
>      django22: djangorestframework>=3.10,<3.11
>      django22: django-filter>=2.1,<3.0
Daniel Axtens Nov. 5, 2019, 3:19 a.m. UTC | #3 
Stephen Finucane <stephen@that.guru> writes:

> On Tue, 2019-10-29 at 17:47 +1100, Daniel Axtens wrote:
>> It's no longer supported upstream, per
>> https://www.djangoproject.com/download/#supported-versions
>> 
>> Signed-off-by: Daniel Axtens <dja@axtens.net>
>
> Hmm, can we not do this until after we've release Patchwork 2.2 (I'll
> be back from PTO/the OpenInfra Summit next week so then would work for
> me)? (or rather revert the patch you've merged until we cut that).
> Personally, given that we need to support Django 1.11 for another
> while, it doesn't seem that helpful to drop support for an intermediate
> release, aside from saving some CI resource. If not, we need to do some
> more cleanup than you've done here. Notes below.
>
>> ---
>>  README.rst                                                 | 2 +-
>>  .../notes/remove-django-2-0-support-623b936d377a8e56.yaml  | 5 +++++
>>  tox.ini                                                    | 7 +++----
>>  3 files changed, 9 insertions(+), 5 deletions(-)
>>  create mode 100644 releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
>> 
>> diff --git a/README.rst b/README.rst
>> index 495cc2bd7862..f5fc1d1aba76 100644
>> --- a/README.rst
>> +++ b/README.rst
>> @@ -39,7 +39,7 @@ Requirements
>>  
>>  - Python (2.7, 3.5 - 3.8)
>>  
>> -- Django (1.11 - 2.2)
>> +- Django (1.11, 2.1 - 2.2)
>>  
>>  - Django REST Framework (3.6 - 3.9)
>>  
>> diff --git a/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
>> new file mode 100644
>> index 000000000000..7513bbead6f8
>> --- /dev/null
>> +++ b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
>> @@ -0,0 +1,5 @@
>> +---
>> +upgrade:
>> +  - |
>> +    Django 2.0 is no longer supported. It is no longer supported upstream
>> +    and most distributions provide a newer version.
>
> This isn't correct. We haven't released a version with Django 2.0
> support so the release note that states we've added support for this
> will be included in the release notes for 2.2. i.e., our 2.2 release
> notes will say:
>

>   - Added support for Django 2.0
>   ...
>   - Removed support for Django 2.0
>
> If you _really_ want to do this, you need to just drop both of these
> release notes but, as noted above, for the sake of a week I'd revert
> this patch.
>

Sure, no worries.

> Stephen
>
>> diff --git a/tox.ini b/tox.ini
>> index 140c19246dd1..397a1c52745a 100644
>> --- a/tox.ini
>> +++ b/tox.ini
>> @@ -1,6 +1,6 @@
>>  [tox]
>>  minversion = 2.0
>> -envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22}
>> +envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,21,22}
>>  skipsdist = True
>>  
>>  [testenv]
>> @@ -11,10 +11,9 @@ deps =
>>      django111: djangorestframework>=3.6,<3.10; python_version < '3.0'
>>      django111: django-filter>=1.0,<3.0; python_version >= '3.5'
>>      django111: django-filter>=1.0,<2.0; python_version < '3.0'
>> -    django20: django>=2.0,<2.1
>>      django21: django>=2.1,<2.2
>> -    django{20,21}: djangorestframework>=3.7,<3.11
>> -    django{20,21}: django-filter>=2.0,<3.0
>> +    django21: djangorestframework>=3.7,<3.11
>> +    django21: django-filter>=2.0,<3.0
>>      django22: django>=2.2,<2.3
>>      django22: djangorestframework>=3.10,<3.11
>>      django22: django-filter>=2.1,<3.0
diff mbox series

Patch

diff --git a/README.rst b/README.rst
index 495cc2bd7862..f5fc1d1aba76 100644
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@  Requirements
 
 - Python (2.7, 3.5 - 3.8)
 
-- Django (1.11 - 2.2)
+- Django (1.11, 2.1 - 2.2)
 
 - Django REST Framework (3.6 - 3.9)
 
diff --git a/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
new file mode 100644
index 000000000000..7513bbead6f8
--- /dev/null
+++ b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
@@ -0,0 +1,5 @@ 
+---
+upgrade:
+  - |
+    Django 2.0 is no longer supported. It is no longer supported upstream
+    and most distributions provide a newer version.
diff --git a/tox.ini b/tox.ini
index 140c19246dd1..397a1c52745a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@ 
 [tox]
 minversion = 2.0
-envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22}
+envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,21,22}
 skipsdist = True
 
 [testenv]
@@ -11,10 +11,9 @@  deps =
     django111: djangorestframework>=3.6,<3.10; python_version < '3.0'
     django111: django-filter>=1.0,<3.0; python_version >= '3.5'
     django111: django-filter>=1.0,<2.0; python_version < '3.0'
-    django20: django>=2.0,<2.1
     django21: django>=2.1,<2.2
-    django{20,21}: djangorestframework>=3.7,<3.11
-    django{20,21}: django-filter>=2.0,<3.0
+    django21: djangorestframework>=3.7,<3.11
+    django21: django-filter>=2.0,<3.0
     django22: django>=2.2,<2.3
     django22: djangorestframework>=3.10,<3.11
     django22: django-filter>=2.1,<3.0