Fix merge conflicts.

Author: jverswijver

CHANGELOG.md

@@ -6,7 +6,7 @@
 * Bugfix - Replace use of numpy aliases of built-in types with built-in type. (#938) PR #939
 * Bugfix - `ExternalTable.delete` should not remove row on error (#953) PR #956
 * Bugfix - Fix error handling of remove_object function in `s3.py` (#952) PR #955
-* Bugfix - Fix regression issue with DISTINCT clause and GROUP_BY (#914) PR #963
+* Bugfix - Fix regression issue with `DISTINCT` clause and `GROUP_BY` (#914) PR #963
 * Bugfix - Fix assertion error when performing a union into a join (#930) PR #967
 
 ### 0.13.2 -- May 7, 2021

datajoint/expression.py

@@ -104,7 +104,7 @@ def where_clause(self):
         return '' if not self.restriction else ' WHERE(%s)' % ')AND('.join(
             str(s) for s in self.restriction)
 
-    def make_sql(self, fields=None, distinct=True):
+    def make_sql(self, fields=None):
         """
         Make the SQL SELECT statement.
         :param fields: used to explicitly set the select attributes

docs-parts/intro/Releases_lang1.rst

@@ -5,8 +5,8 @@
 * Bugfix - Replace use of numpy aliases of built-in types with built-in type. (#938) PR #939
 * Bugfix - `ExternalTable.delete` should not remove row on error (#953) PR #956
 * Bugfix - Fix error handling of remove_object function in `s3.py` (#952) PR #955
-* Bugfix - Fix regression issue with DISTINCT clause and GROUP_BY (#914) PR #963
 * Bugfix - Fix assertion error when performing a union into a join (#930) PR #967
+* Bugfix - Fix regression issue with ``DISTINCT`` and ``GROUP_BY`` clause (#914) PR #963
 
 0.13.2 -- May 7, 2021
 ----------------------

tests/test_fetch.py

@@ -292,12 +292,9 @@ def test_query_caching(self):
     def test_fetch_group_by(self):
         # https://github.com/datajoint/datajoint-python/issues/914
 
-        expected_data = [{'parent_id': 1}]
-        fetched_data = Parent().fetch('KEY', order_by='name')
-        print(fetched_data)
-        assert fetched_data == expected_data
+        assert Parent().fetch('KEY', order_by='name') == [{'parent_id': 1}]
 
-    def test_dj_U_DISTINCT(self):
+    def test_dj_u_distinct(self):
         # Test developed to see if removing DISTINCT from the select statement
         # generation breakes the dj.U universal set imlementation