Merge pull request #1172 from freedomofpress/update-to-sdk-0.2.0

update requirements
freedomofpress · Nov 3, 2020 · 5cb61ec · 5cb61ec
2 parents 920d394 + a4d7943
commit 5cb61ec
Show file tree

Hide file tree

Showing 22 changed files with 1,857 additions and 2,271 deletions.
diff --git a/requirements/build-requirements.txt b/requirements/build-requirements.txt
@@ -9,7 +9,7 @@ pathlib2==2.3.2 --hash=sha256:460e67b14d0574b0529a0017b1eb05d10d9722681e303fec70
 python-dateutil==2.7.5 --hash=sha256:f6eb9c17acd5a6954e1a5f2f999a41de3e7e25b6bc41baf6344bd053ec25ceeb
 python-editor==1.0.3 --hash=sha256:e47dcec4ea883853b8196fbd425b875d7ec791d4ede2e20cfc70b9a25365c65b
 requests==2.22.0 --hash=sha256:e3711bd465fd013abe428a8dade2938b578f05d2b06b0ae83daa98869c4548e8
-securedrop-sdk==0.1.1 --hash=sha256:a631495acd741ab568410287879c5a3af3ccd38e00a2f3a127cc6b27cba99392
+securedrop-sdk==0.2.0 --hash=sha256:dd0231e1b873197373a7e84e3610370634eead601223551153eca7cdd166e7d5
 six==1.11.0 --hash=sha256:aa4ad34049ddff178b533062797fd1db9f0038b7c5c2461a7cde2244300b9f3d
 sqlalchemy==1.3.3 --hash=sha256:bfb4cd0df5802a01acd738a080a19e60ff4700e030d497de273807f9a8bd4a0a
 urllib3==1.25.10 --hash=sha256:32bcd1ec52a4dd17ede2725ad166c789f50d402870947d6824598915b89ecf70
diff --git a/requirements/dev-mac-requirements.txt b/requirements/dev-mac-requirements.txt
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
@@ -377,8 +377,8 @@ requests==2.22.0 \
     --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \
     --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 \
     # via -r requirements/requirements.in, securedrop-sdk
-securedrop-sdk==0.1.1 \
-    --hash=sha256:138ce7a717db519c3c8d19b9475d7660fb7095d7608e8802723e682a7415e677 \
+securedrop-sdk==0.2.0 \
+    --hash=sha256:c4a343077e8c0a38914e17f6369b830f1e361f9d66699b20803c07b39472357f \
     # via -r requirements/requirements.in
 sip==4.19.8 \
     --hash=sha256:09f9a4e6c28afd0bafedb26ffba43375b97fe7207bd1a0d3513f79b7d168b331 \

diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -9,7 +9,7 @@ pathlib2==2.3.2
 python-dateutil==2.7.5
 python-editor==1.0.3
 requests==2.22.0
-securedrop-sdk==0.1.1
+securedrop-sdk==0.2.0
 six==1.11.0
 SQLAlchemy==1.3.3
 urllib3==1.25.10
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -75,8 +75,8 @@ requests==2.22.0 \
     --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \
     --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 \
     # via -r requirements/requirements.in, securedrop-sdk
-securedrop-sdk==0.1.1 \
-    --hash=sha256:138ce7a717db519c3c8d19b9475d7660fb7095d7608e8802723e682a7415e677 \
+securedrop-sdk==0.2.0 \
+    --hash=sha256:c4a343077e8c0a38914e17f6369b830f1e361f9d66699b20803c07b39472357f \
     # via -r requirements/requirements.in
 six==1.11.0 \
     --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \

diff --git a/tests/factory.py b/tests/factory.py
@@ -187,6 +187,7 @@ def RemoteSource(**attrs):
         submissions_url="wibble",
         url="url",
         uuid=str(uuid.uuid4()),
+        seen_by=None,
     )
 
     defaults.update(attrs)

diff --git a/tests/functional/cassettes/test_delete_source.yaml b/tests/functional/cassettes/test_delete_source.yaml
diff --git a/tests/functional/cassettes/test_download_file.yaml b/tests/functional/cassettes/test_download_file.yaml
diff --git a/tests/functional/cassettes/test_export_dialog.yaml b/tests/functional/cassettes/test_export_dialog.yaml
diff --git a/tests/functional/cassettes/test_login_as_journalist.yaml b/tests/functional/cassettes/test_login_as_journalist.yaml
diff --git a/tests/functional/cassettes/test_login_from_offline.yaml b/tests/functional/cassettes/test_login_from_offline.yaml
diff --git a/tests/functional/cassettes/test_logout_as_journalist.yaml b/tests/functional/cassettes/test_logout_as_journalist.yaml
diff --git a/tests/functional/cassettes/test_offline_delete_source_attempt.yaml b/tests/functional/cassettes/test_offline_delete_source_attempt.yaml
diff --git a/tests/functional/cassettes/test_offline_read_conversation.yaml b/tests/functional/cassettes/test_offline_read_conversation.yaml
diff --git a/tests/functional/cassettes/test_offline_send_reply_to_source.yaml b/tests/functional/cassettes/test_offline_send_reply_to_source.yaml
diff --git a/tests/functional/cassettes/test_offline_star_source.yaml b/tests/functional/cassettes/test_offline_star_source.yaml
diff --git a/tests/functional/cassettes/test_receive_message_from_source.yaml b/tests/functional/cassettes/test_receive_message_from_source.yaml
diff --git a/tests/functional/cassettes/test_send_reply_to_source.yaml b/tests/functional/cassettes/test_send_reply_to_source.yaml
diff --git a/tests/functional/cassettes/test_star_source.yaml b/tests/functional/cassettes/test_star_source.yaml
diff --git a/tests/functional/cassettes/test_user_icon_click.yaml b/tests/functional/cassettes/test_user_icon_click.yaml
diff --git a/tests/migrations/utils.py b/tests/migrations/utils.py
@@ -84,10 +84,7 @@ def add_user(session: Session, uuid: Optional[str] = None) -> None:
     else:
         journalist_uuid = uuid
 
-    params = {
-        "uuid": journalist_uuid,
-        "username": random_username(),
-    }
+    params = {"uuid": journalist_uuid, "username": random_username()}
     sql = """
     INSERT INTO users (uuid, username)
     VALUES (:uuid, :username)

diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -62,6 +62,7 @@ def make_remote_message(source_uuid, file_counter=1):
         source_url=source_url,
         submission_url="test",
         uuid=str(uuid.uuid4()),
+        seen_by=None,
     )
 
 
@@ -80,6 +81,7 @@ def make_remote_submission(source_uuid):
         source_url=source_url,
         submission_url="test",
         uuid=str(uuid.uuid4()),
+        seen_by=None,
     )
 
 
@@ -102,6 +104,7 @@ def make_remote_reply(source_uuid, journalist_uuid="testymctestface"):
         size=1234,
         source_url=source_url,
         uuid=str(uuid.uuid4()),
+        seen_by=None,
     )
 
 
@@ -757,6 +760,7 @@ def test_update_replies(homedir, mocker, session):
         source_url="/api/v1/sources/{}".format(source.uuid),
         file_counter=local_reply_update.file_counter,
         filename=local_reply_update.filename,
+        seen_by=None,
     )
 
     remote_reply_create = factory.RemoteReply(
@@ -766,6 +770,7 @@ def test_update_replies(homedir, mocker, session):
         filename="{}-filename.gpg".format(factory.REPLY_COUNT + 1),
         journalist_first_name="",
         journalist_last_name="",
+        seen_by=None,
     )
 
     remote_replies = [remote_reply_update, remote_reply_create]