From f14858c2fe190799d7b238c9edd891cf095c51e0 Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Thu, 11 Jun 2020 10:44:20 +0200
Subject: [PATCH] Version bump and changelog for 0.21.1

---
 CHANGELOG                            | 51 ++++++++++++++++++++++++++++
 CONTRIBUTING.rst                     |  2 +-
 api/funkwhale_api/__init__.py        |  2 +-
 changes/changelog.d/1011.bugfix      |  1 -
 changes/changelog.d/1048.bugfix      |  1 -
 changes/changelog.d/1078.bugfix      |  1 -
 changes/changelog.d/1082.bugfix      |  1 -
 changes/changelog.d/1085.enhancement |  1 -
 changes/changelog.d/1086.bugfix      |  1 -
 changes/changelog.d/1087.bugfix      |  1 -
 changes/changelog.d/1090.bugfix      |  1 -
 changes/changelog.d/1091.bugfix      |  1 -
 changes/changelog.d/1092.bugfix      |  1 -
 changes/changelog.d/1093.bugfix      |  1 -
 changes/changelog.d/1096.bugfix      |  1 -
 changes/changelog.d/1107.enhancement |  1 -
 changes/changelog.d/1112.enhancement |  1 -
 changes/changelog.d/1113.enhancement |  1 -
 changes/changelog.d/1117.bugfix      |  1 -
 changes/changelog.d/1151.enhancement |  1 -
 changes/changelog.d/1154.enhancement |  1 -
 changes/changelog.d/1155.bugfix      |  1 -
 changes/changelog.d/721.feature      |  1 -
 23 files changed, 53 insertions(+), 22 deletions(-)
 delete mode 100644 changes/changelog.d/1011.bugfix
 delete mode 100644 changes/changelog.d/1048.bugfix
 delete mode 100644 changes/changelog.d/1078.bugfix
 delete mode 100644 changes/changelog.d/1082.bugfix
 delete mode 100644 changes/changelog.d/1085.enhancement
 delete mode 100644 changes/changelog.d/1086.bugfix
 delete mode 100644 changes/changelog.d/1087.bugfix
 delete mode 100644 changes/changelog.d/1090.bugfix
 delete mode 100644 changes/changelog.d/1091.bugfix
 delete mode 100644 changes/changelog.d/1092.bugfix
 delete mode 100644 changes/changelog.d/1093.bugfix
 delete mode 100644 changes/changelog.d/1096.bugfix
 delete mode 100644 changes/changelog.d/1107.enhancement
 delete mode 100644 changes/changelog.d/1112.enhancement
 delete mode 100644 changes/changelog.d/1113.enhancement
 delete mode 100644 changes/changelog.d/1117.bugfix
 delete mode 100644 changes/changelog.d/1151.enhancement
 delete mode 100644 changes/changelog.d/1154.enhancement
 delete mode 100644 changes/changelog.d/1155.bugfix
 delete mode 100644 changes/changelog.d/721.feature

diff --git a/CHANGELOG b/CHANGELOG
index 28205caea..df36eb05a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,57 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.21.1 (2020-06-11)
+-------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/index.html
+
+
+Features:
+
+- Support a --watch mode with ``import_files`` to automatically add, update and remove files when filesystem is updated (#721)
+
+Enhancements:
+
+- Added new channels widget on pod landing page (#1113)
+- Fix HTML <title> not including instance name in some situations (#1107)
+- Make URL-building logic more resilient against reverse proxy misconfiguration (#1085)
+- Removed unused masonry dependency (#1112)
+- Support for specifying itunes:email and itunes:name in channels for compatibiliy with third-party platforms (#1154)
+- Updated the /api/v1/libraries endpoint to support listing public libraries from other users/pods (#1151)
+
+
+Bugfixes:
+
+- Added safeguard to ensure local uploads are never purged from cache (#1086)
+- Ensure firefox password manager dont autofill username in search bar (#1090)
+- Ensure player doesn't disappear when last queue track is removed manually (#1092)
+- Ensure tracks linked to skipped upload can be pruned (#1011)
+- Fix playlist modal only listing 50 first playlists (#1087)
+- Fixed a wording issue on artist channel page (#1117)
+- Fixed crash on python 3.5 with cli importer (#1155)
+- Fixed issue when displaying starred tracks on subsonic (#1082)
+- Fixed mimetype detection issue that broke transcoding on some tracks (#1093). Run ``python manage.py fix_uploads --mimetype`` to set proper mimetypes on existing uploads.
+- Fixed page not refreshing when switching between My Library and Explore sections (#1091)
+- Fixed recursive CLI importing crashing under Python 3.5 (#1148, #1147)
+- Fixed wrong album and track count in admin artist API (#1096)
+- Include tracks by album artist when filtering by artist on /api/v1/tracks (#1078)
+
+Small API breaking change in ``/api/v1/libraries``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To allow easier crawling of public libraries on a pod,we had to make a slight breaking change
+to the behaviour of ``GET /api/v1/libraries``.
+
+Before, it returned only libraries owned by the current user.
+
+Now, it returns all the accessible libraries (including ones from other users and pods).
+
+If you are consuming the API via a third-party client and need to retrieve your libraries,
+use the ``scope`` parameter, like this: ``GET /api/v1/libraries?scope=me``
+
+
 0.21 "Agate" (2020-04-24)
 -------------------------
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index fe081b97c..b313b6da6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -746,7 +746,7 @@ To make a new 3.4 release::
     nano CHANGELOG
 
     # Set the `__version__` variable to $NEXT_RELEASE
-    nano nano api/funkwhale_api/__init__.py
+    nano api/funkwhale_api/__init__.py
 
     # commit
     git add .
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index ea28336fc..9ad0c1d71 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.21"
+__version__ = "0.21.1"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1011.bugfix b/changes/changelog.d/1011.bugfix
deleted file mode 100644
index 0b52c0e6e..000000000
--- a/changes/changelog.d/1011.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure tracks linked to skipped upload can be pruned (#1011)
diff --git a/changes/changelog.d/1048.bugfix b/changes/changelog.d/1048.bugfix
deleted file mode 100644
index 0f1973444..000000000
--- a/changes/changelog.d/1048.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed recursive CLI importing crashing under Python 3.5 (#1148, #1147)
diff --git a/changes/changelog.d/1078.bugfix b/changes/changelog.d/1078.bugfix
deleted file mode 100644
index fc966e9bd..000000000
--- a/changes/changelog.d/1078.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Include tracks by album artist when filtering by artist on /api/v1/tracks (#1078)
diff --git a/changes/changelog.d/1082.bugfix b/changes/changelog.d/1082.bugfix
deleted file mode 100644
index b99f0c1f0..000000000
--- a/changes/changelog.d/1082.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed issue when displaying starred tracks on subsonic (#1082)
diff --git a/changes/changelog.d/1085.enhancement b/changes/changelog.d/1085.enhancement
deleted file mode 100644
index 49cbee6f8..000000000
--- a/changes/changelog.d/1085.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Make URL-building logic more resilient against reverse proxy misconfiguration (#1085)
diff --git a/changes/changelog.d/1086.bugfix b/changes/changelog.d/1086.bugfix
deleted file mode 100644
index db7c38dda..000000000
--- a/changes/changelog.d/1086.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added safeguard to ensure local uploads are never purged from cache (#1086)
diff --git a/changes/changelog.d/1087.bugfix b/changes/changelog.d/1087.bugfix
deleted file mode 100644
index 36293d96a..000000000
--- a/changes/changelog.d/1087.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix playlist modal only listing 50 first playlists (#1087)
diff --git a/changes/changelog.d/1090.bugfix b/changes/changelog.d/1090.bugfix
deleted file mode 100644
index 59be2db6b..000000000
--- a/changes/changelog.d/1090.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure firefox password manager dont autofill username in search bar (#1090)
diff --git a/changes/changelog.d/1091.bugfix b/changes/changelog.d/1091.bugfix
deleted file mode 100644
index d51cd00df..000000000
--- a/changes/changelog.d/1091.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed page not refreshing when switching between My Library and Explore sections (#1091)
diff --git a/changes/changelog.d/1092.bugfix b/changes/changelog.d/1092.bugfix
deleted file mode 100644
index 018470ac8..000000000
--- a/changes/changelog.d/1092.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure player doesn't disappear when last queue track is removed manually (#1092)
diff --git a/changes/changelog.d/1093.bugfix b/changes/changelog.d/1093.bugfix
deleted file mode 100644
index 0295841af..000000000
--- a/changes/changelog.d/1093.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed mimetype detection issue that broke transcoding on some tracks (#1093). Run ``python manage.py fix_uploads --mimetype`` to set proper mimetypes on existing uploads.
diff --git a/changes/changelog.d/1096.bugfix b/changes/changelog.d/1096.bugfix
deleted file mode 100644
index 81ffb284d..000000000
--- a/changes/changelog.d/1096.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed wrong album and track count in admin artist API (#1096)
diff --git a/changes/changelog.d/1107.enhancement b/changes/changelog.d/1107.enhancement
deleted file mode 100644
index 2b4ff8863..000000000
--- a/changes/changelog.d/1107.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Fix HTML <title> not including instance name in some situations (#1107)
diff --git a/changes/changelog.d/1112.enhancement b/changes/changelog.d/1112.enhancement
deleted file mode 100644
index 28d3a3739..000000000
--- a/changes/changelog.d/1112.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Removed unused masonry dependency (#1112)
diff --git a/changes/changelog.d/1113.enhancement b/changes/changelog.d/1113.enhancement
deleted file mode 100644
index 979b33056..000000000
--- a/changes/changelog.d/1113.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added new channels widget on pod landing page (#1113)
diff --git a/changes/changelog.d/1117.bugfix b/changes/changelog.d/1117.bugfix
deleted file mode 100644
index b2236ee70..000000000
--- a/changes/changelog.d/1117.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a wording issue on artist channel page (#1117)
diff --git a/changes/changelog.d/1151.enhancement b/changes/changelog.d/1151.enhancement
deleted file mode 100644
index c9b867a30..000000000
--- a/changes/changelog.d/1151.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Updated the /api/v1/libraries endpoint to support listing public libraries from other users/pods (#1151)
diff --git a/changes/changelog.d/1154.enhancement b/changes/changelog.d/1154.enhancement
deleted file mode 100644
index e5caf8976..000000000
--- a/changes/changelog.d/1154.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Support for specifying itunes:email and itunes:name in channels for compatibiliy with third-party platforms (#1154)
diff --git a/changes/changelog.d/1155.bugfix b/changes/changelog.d/1155.bugfix
deleted file mode 100644
index e67ec0d74..000000000
--- a/changes/changelog.d/1155.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed crash on python 3.5 with cli importer (#1155)
diff --git a/changes/changelog.d/721.feature b/changes/changelog.d/721.feature
deleted file mode 100644
index 332f992eb..000000000
--- a/changes/changelog.d/721.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support a --watch mode with ``import_files`` to automatically add, update and remove files when filesystem is updated (#721)