From 0c59d6d261e12a7255dcd445ceacac68ac56fd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <hubscher.remy@gmail.com>
Date: Mon, 5 Oct 2020 11:18:13 +0200
Subject: [PATCH] Preparing release 2.2

---
 CHANGELOG             |  6 +++++-
 VERSION               |  2 +-
 docs/conf.py          | 20 ++++++++++----------
 docs/views/custom.txt |  4 ++--
 setup.py              |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9cf2e0a..1b82cbf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,7 +8,11 @@ future releases, check `milestones`_ and :doc:`/about/vision`.
 2.2 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Remove support for Python 3.5 and Django 1.11
+- Add support for Python 3.9 and Django 3.1
+- Remove old urls syntax and adopt the new one
+- Move the project to the jazzband organization
+- Adopt black automatic formatting rules
 
 
 2.1.1 (2020-01-14)
diff --git a/VERSION b/VERSION
index 6710ad0..8bbe6cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.dev0
+2.2
diff --git a/docs/conf.py b/docs/conf.py
index 1c7325d..3c77bb7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,11 +36,11 @@ source_encoding = "utf-8"
 master_doc = "index"
 
 # General information about the project.
-project = u"django-downloadview"
-project_slug = re.sub(r"([\w_.-]+)", u"-", project)
-copyright = u"2012-2015, Benoît Bryon"
-author = u"Benoît Bryon"
-author_slug = re.sub(r"([\w_.-]+)", u"-", author)
+project = "django-downloadview"
+project_slug = re.sub(r"([\w_.-]+)", "-", project)
+copyright = "2012-2015, Benoît Bryon"
+author = "Benoît Bryon"
+author_slug = re.sub(r"([\w_.-]+)", "-", author)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -83,7 +83,7 @@ html_sidebars = {
 }
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = u"{project}doc".format(project=project_slug)
+htmlhelp_basename = "{project}doc".format(project=project_slug)
 
 
 # -- Options for sphinx.ext.intersphinx ---------------------------------------
@@ -108,8 +108,8 @@ latex_elements = {}
 latex_documents = [
     (
         "index",
-        u"{project}.tex".format(project=project_slug),
-        u"{project} Documentation".format(project=project),
+        "{project}.tex".format(project=project_slug),
+        "{project} Documentation".format(project=project),
         author,
         "manual",
     ),
@@ -121,7 +121,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ("index", project, u"{project} Documentation".format(project=project), [author], 1)
+    ("index", project, "{project} Documentation".format(project=project), [author], 1)
 ]
 
 
@@ -134,7 +134,7 @@ texinfo_documents = [
     (
         "index",
         project_slug,
-        u"{project} Documentation".format(project=project),
+        "{project} Documentation".format(project=project),
         author,
         project,
         "One line description of project.",
diff --git a/docs/views/custom.txt b/docs/views/custom.txt
index df7323e..4aed6ed 100644
--- a/docs/views/custom.txt
+++ b/docs/views/custom.txt
@@ -87,7 +87,7 @@ Modified" response:
    class TextDownloadView(VirtualDownloadView):
        def get_file(self):
            """Return :class:`django.core.files.base.ContentFile` object."""
-           return ContentFile(u"Hello world!", name='hello-world.txt')
+           return ContentFile("Hello world!", name='hello-world.txt')
 
        def was_modified_since(self, file_instance, since):
-           return False  # Never modified, always u"Hello world!".
+           return False  # Never modified, always "Hello world!".
diff --git a/setup.py b/setup.py
index a8c2ab2..8ad5aa1 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ NAME = "django-downloadview"
 DESCRIPTION = "Serve files with Django and reverse-proxies."
 README = open(os.path.join(here, "README.rst")).read()
 VERSION = open(os.path.join(here, "VERSION")).read().strip()
-AUTHOR = u"Benoît Bryon"
+AUTHOR = "Benoît Bryon"
 EMAIL = "benoit@marmelune.net"
 LICENSE = "BSD"
 URL = "https://{name}.readthedocs.io/".format(name=NAME)