Merge pull request django-oscar#3111 from solarissmoke/feature/2.0.1

Version bump and release notes for 2.0.1
ajharry69 · Aug 9, 2019 · 0bf3b0a · 0bf3b0a
2 parents 7994fd7 + 61d664b
commit 0bf3b0a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst
@@ -11,6 +11,7 @@ Release notes for each version of Oscar published to PyPI.
     :maxdepth: 1
 
     v2.0
+    v2.0.1
 
 
 1.6 release branch

diff --git a/docs/source/releases/v2.0.1.rst b/docs/source/releases/v2.0.1.rst
@@ -0,0 +1,20 @@
+=======================
+Oscar 2.0.1 release notes
+=======================
+
+:release: 2019-08-09
+
+This is Oscar 2.0.1, a bugfix release.
+
+Bug fixes
+=========
+
+- Fixed ``oscar.dashboard.nav.default_access_fn`` to properly check permissions
+  configured on forked dashboard apps.
+- Refactored ``ProductQuerySet.base_queryset()`` to avoid making an expensive
+  database query when checking for product options. Queryset items are no
+  longer annotated with ``num_product_class_options`` and
+  ``num_product_options``(counts of the number of options associated with a
+  product and product class, respectively. Instead are annotated with
+  ``has_product_class_options`` and ``has_product_options``.
+- Fixed display of start and end dates in the dashboard offer list template.
diff --git a/docs/source/releases/v2.0.rst b/docs/source/releases/v2.0.rst
@@ -6,7 +6,7 @@
 Oscar 2.0 release notes
 =======================
 
-:release: 2019-04-04
+:release: 2019-07-04
 
 Welcome to Oscar 2.0. This is a significant release which includes a number of
 new features and backwards incompatible changes. In particular the way Oscar

diff --git a/src/oscar/__init__.py b/src/oscar/__init__.py
@@ -1,5 +1,5 @@
 # Use 'alpha', 'beta', 'rc' or 'final' as the 4th element to indicate release type.
-VERSION = (2, 0, 0, 'final')
+VERSION = (2, 0, 1, 'final')
 
 
 def get_short_version():
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ Release notes for each version of Oscar published to PyPI. @@
         :maxdepth: 1
         v2.0
+        v2.0.1
 .6 release branch
@@ Expand Down @@