Merge pull request #252 from django-oscar/prepare-for-release-2.1.0

Prepare for release 2.1.0
django-oscar · Nov 13, 2020 · 8179b31 · 8179b31
2 parents 80e68c7 + 8497f14
commit 8179b31
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -2,6 +2,26 @@
 Changelog
 =========
 
+2.1.0 (2020-11-13)
+------------------
+This release adds support for Oscar 2.1 and includes various new features and fixes. Supported Django versions are 2.2 and 3.0, and supported Python versions are 3.6, 3.7 and 3.8.
+
+Features:
+ * `#202 <https://github.com/django-oscar/django-oscar-api/pull/202>`_ Defer downloading of image data until the file data is accessed
+ * `#219 <https://github.com/django-oscar/django-oscar-api/pull/219>`_ Allow DRF Versioning schemes. You need to accept ``*args`` and ``**kwargs`` in your view overrides.
+ * `#238 <https://github.com/django-oscar/django-oscar-api/pull/239>`_ The Order serializer replaced the ``guest_email`` with an ``email`` field which is used for both anonymous and user associated orders (viggo-devries)
+ * `#244 <https://github.com/django-oscar/django-oscar-api/pull/244>`_ Added separate User serializers for the regular and admin API, introduced the ``OSCARAPI_EXPOSE_USER_DETAILS`` setting to control the exposure of user details
+* `#246 <https://github.com/django-oscar/django-oscar-api/pull/246>`_ Added a user registration endpoint. It can be enabled/disabled with the ``OSCARAPI_ENABLE_REGISTRATION`` setting
+* `#251 <https://github.com/django-oscar/django-oscar-api/pull/251>`_ Also serialize ``Surcharge`` objects in the Order serializer (Surcharges are introduced in Oscar 2.1)
+
+Fixed:
+ * `#213 <https://github.com/django-oscar/django-oscar-api/pull/213>`_ Fix OpenAPI integration (mazur-work)
+ * `#221 <https://github.com/django-oscar/django-oscar-api/pull/221>`_ Fix APIGatewayMiddleware handling of valid API keys (solarissmoke)
+ * `#228 <https://github.com/django-oscar/django-oscar-api/pull/228>`_ BasketLineDetail: Use DRF get_object_or_404 (jayvdb)
+ * `#230 <https://github.com/django-oscar/django-oscar-api/pull/230>`_ Mount the Admin API on the /admin endpoint with ``path()``
+ * `#234 <https://github.com/django-oscar/django-oscar-api/pull/234>`_ Make all Admin API url endpoints prefixed consistently with ``admin-``
+
+
 2.0.2 (2019-12-20)
 ------------------
 This is a bugfix release for version 2.0.1.

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-__version__ = "2.1dev0"
+__version__ = "2.1.0"
 
 setup(
     # package name in pypi