Update test and changelogs.

Author: jverswijver

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Release notes
 
 ### 0.13.3 -- TBD
+* Add - Expose proxy feature for S3 external stores (#961) PR #962
 * Bugfix - Dependencies not properly loaded on populate. (#902) PR #919
 * 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

docs-parts/intro/Releases_lang1.rst

@@ -1,5 +1,6 @@
 0.13.3 -- TBD
 ----------------------
+* Add - Expose proxy feature for S3 external stores (#961) PR #962
 * Bugfix - Dependencies not properly loaded on populate. (#902) PR #919
 * 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

requirements.txt

@@ -10,3 +10,4 @@ minio>=7.0.0
 matplotlib
 cryptography
 otumat
+urllib3

tests/test_aggr_regressions.py

@@ -93,20 +93,6 @@ class X(dj.Lookup):
     """
     contents = zip(range(10))
 
-@schema
-class TableA(dj.Manual):
-    definition = """
-    table_a: int
-    """
-
-
-@schema
-class TableB(dj.Manual):
-    definition = """
-    -> TableA
-    table_b: int
-    """
-
 
 def test_issue558_part1():
     q = (A-B).proj(id2='3')
@@ -120,9 +106,13 @@ def test_issue558_part2():
 
 def test_union_join():
     # https://github.com/datajoint/datajoint-python/issues/930
-    TableA.insert(zip([1, 2, 3, 4, 5, 6]))
-    TableB.insert([(1, 11), (2, 22), (3, 33), (4, 44)])
-    q1 = TableB & 'table_a < 3'
-    q2 = TableB & 'table_a > 3'
+    A.insert(zip([100, 200, 300, 400, 500, 600]))
+    B.insert([(100, 11), (200, 22), (300, 33), (400, 44)])
+    q1 = B & 'id < 300'
+    q2 = B & 'id > 300'
+
+    expected_data = [{'id': 0, 'id2': 5}, {'id': 1, 'id2': 6}, {'id': 2, 'id2': 7},
+                     {'id': 3, 'id2': 8}, {'id': 4, 'id2': 9}, {'id': 100, 'id2': 11},
+                     {'id': 200, 'id2': 22}, {'id': 400, 'id2': 44}]
 
-    (q1 + q2) * TableA
+    assert ((q1 + q2) * A).fetch(as_dict=True) == expected_data