Stephen Finucane <step...@that.guru> writes:
> This reverts commit f09bfd460814d7125437b0b45a183a221692584a. We haven't
> actually released a version of Patchwork with this release yet so it
> seems odd to skip it entirely. It's also incorrect, in that it adds an
> additional release note rather than remove the one that has not yet been
> included in a release. Given both of these, and the fact that 2.2 is
> just around the corner, we should simply revert this patch and reapply
> it in a few weeks instead.
>
> Signed-off-by: Stephen Finucane <step...@that.guru>
So I already did a plain git-revert and pushed it. I thought my reply
was clear enough, but in hindsight it obviously wasn't and I should have
also emailed it to the list.
> ---
> README.rst | 2 +-
> .../notes/remove-django-2-0-support-623b936d377a8e56.yaml | 4 ----
> tox.ini | 7 ++++---
> 3 files changed, 5 insertions(+), 8 deletions(-)
> delete mode 100644
> releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
>
> diff --git README.rst README.rst
> index f5fc1d1a..495cc2bd 100644
> --- README.rst
> +++ README.rst
> @@ -39,7 +39,7 @@ Requirements
>
> - Python (2.7, 3.5 - 3.8)
>
> -- Django (1.11, 2.1 - 2.2)
> +- Django (1.11 - 2.2)
>
> - Django REST Framework (3.6 - 3.9)
>
> diff --git releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> deleted file mode 100644
> index 58a1273a..00000000
> --- releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
> +++ /dev/null
> @@ -1,4 +0,0 @@
> ----
> -upgrade:
> - - |
> - Django 2.0 is no longer supported. It is no longer supported upstream.
> diff --git tox.ini tox.ini
> index 397a1c52..140c1924 100644
> --- tox.ini
> +++ tox.ini
> @@ -1,6 +1,6 @@
> [tox]
> minversion = 2.0
> -envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,21,22}
> +envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22}
> skipsdist = True
>
> [testenv]
> @@ -11,9 +11,10 @@ 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
> - django21: djangorestframework>=3.7,<3.11
> - django21: django-filter>=2.0,<3.0
> + django{20,21}: djangorestframework>=3.7,<3.11
> + django{20,21}: 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.21.0
>
> _______________________________________________
> Patchwork mailing list
> Patchwork@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/patchwork
_______________________________________________
Patchwork mailing list
Patchwork@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/patchwork
