From 71ba00b91ce28652fab40989392fe9a70ace49f6 Mon Sep 17 00:00:00 2001
From: mickael e <mickael@freedom.press>
Date: Tue, 8 Sep 2020 14:41:47 -0400
Subject: [PATCH 1/2] Check the requirements folder in repo for
 requirements.txt

In https://github.com/freedomofpress/securedrop-client/pull/1128/files, the requirements files were re-arranged, and the requirements.txt file could no longer be found. We check for the presence of a requirements file in requirements subfolder, after checking in the repo root, before erroring out.
---
 scripts/build-sync-wheels | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/build-sync-wheels b/scripts/build-sync-wheels
index 14eff2e5..3e22528b 100755
--- a/scripts/build-sync-wheels
+++ b/scripts/build-sync-wheels
@@ -26,8 +26,12 @@ def main():
         print("Project directory missing {0}.".format(args.p))
         sys.exit(1)
 
+    # Try requirements.txt in the repo root, otherwise try requirements/requirements.txt
     req_path = os.path.join(args.p, "requirements.txt")
 
+    if not os.path.exists(req_path):
+        req_path = os.path.join(args.p, "requirements/requirements.txt")
+
     if not os.path.exists(req_path):
         print("requirements.txt missing at {0}.".format(req_path))
         sys.exit(3)

From d5cf9519b2818a63d16984715ea88c68cb240be0 Mon Sep 17 00:00:00 2001
From: mickael e <mickael@freedom.press>
Date: Tue, 8 Sep 2020 14:53:31 -0400
Subject: [PATCH 2/2] Adds securedrop-sdk 0.1.1 wheel and sources

---
 localwheels/securedrop-sdk-0.1.1.tar.gz       |  3 +++
 .../securedrop_sdk-0.1.1-py3-none-any.whl     |  3 +++
 sha256sums.txt                                |  2 ++
 sha256sums.txt.asc                            | 26 +++++++++----------
 simple/securedrop-sdk/index.html              |  2 ++
 5 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 localwheels/securedrop-sdk-0.1.1.tar.gz
 create mode 100644 localwheels/securedrop_sdk-0.1.1-py3-none-any.whl

diff --git a/localwheels/securedrop-sdk-0.1.1.tar.gz b/localwheels/securedrop-sdk-0.1.1.tar.gz
new file mode 100644
index 00000000..7711dc74
--- /dev/null
+++ b/localwheels/securedrop-sdk-0.1.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:138ce7a717db519c3c8d19b9475d7660fb7095d7608e8802723e682a7415e677
+size 24059
diff --git a/localwheels/securedrop_sdk-0.1.1-py3-none-any.whl b/localwheels/securedrop_sdk-0.1.1-py3-none-any.whl
new file mode 100644
index 00000000..e2b5700c
--- /dev/null
+++ b/localwheels/securedrop_sdk-0.1.1-py3-none-any.whl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a631495acd741ab568410287879c5a3af3ccd38e00a2f3a127cc6b27cba99392
+size 22085
diff --git a/sha256sums.txt b/sha256sums.txt
index 489450e7..aefb95ed 100644
--- a/sha256sums.txt
+++ b/sha256sums.txt
@@ -38,6 +38,8 @@ c8d98208fb2074336c06be3fef0994a8a57fde7a765cead12bc36e9128d319e2  securedrop_sdk
 7763bb44755bdfc387ab6c002cbe49eeec2611feb04a8787c3c9f2aa48a1ee5f  securedrop-sdk-0.0.13.tar.gz
 488417f9f08e4c432c81348dfbd5da0e756ded1737ba58b2ffc8f0e703abc1cb  securedrop_sdk-0.1.0-py3-none-any.whl
 970fde25e6238e1808ac120951ee972549f4cd7952966dfe29f731bb308cc0d8  securedrop-sdk-0.1.0.tar.gz
+a631495acd741ab568410287879c5a3af3ccd38e00a2f3a127cc6b27cba99392  securedrop_sdk-0.1.1-py3-none-any.whl
+138ce7a717db519c3c8d19b9475d7660fb7095d7608e8802723e682a7415e677  securedrop-sdk-0.1.1.tar.gz
 aa4ad34049ddff178b533062797fd1db9f0038b7c5c2461a7cde2244300b9f3d  six-1.11.0-py2.py3-none-any.whl
 70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9  six-1.11.0.tar.gz
 bfb4cd0df5802a01acd738a080a19e60ff4700e030d497de273807f9a8bd4a0a  SQLAlchemy-1.3.3-cp37-cp37m-linux_x86_64.whl
diff --git a/sha256sums.txt.asc b/sha256sums.txt.asc
index 4cd4a9ea..0b5b4da4 100644
--- a/sha256sums.txt.asc
+++ b/sha256sums.txt.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEIiRcgeO660E4s2BhMQ9WEgD0rXcFAl6oPWkACgkQMQ9WEgD0
-rXctLQ/+J9P92tGdsaziz3i/WdNSb4RxOJXMf8h8l6yvOx/hLz9snTubvPzEqo7X
-X3Vhqe1HAzE39J29G0gd5+BbvbIP6qBYh6ggjwiEi8WlHUdgM8kFiEXGpHNFDQkA
-ixS7ETyEtAxdiQFaHNQkNKVxs9ecCcC09ceOaMaWbuphov7KAje9aIUC/7PjpI0+
-G91gSZbIojL4xskGlIHF1bOuATZxjuNyNpjvDcOyHaxcnZXd81fwgGWPkBTrHV2n
-e/FtJRl/AzekS4D5RRfM85JhULV8xXJWKuIzlFr94blVAWLWWqh51ho4lXeyeqgk
-Y1G8TIjFYxuvnHVM7dZXhzS5cCBoK5uAhV1ihCw6tUge5d8okoEHOuFM4K1rO9OC
-xbNET3iqRzmhUmSdjIb3Wxyy6stNKyExQPAXPEq+QtSlT/rZZi0FxEHsbh9S6AL2
-p8VtepU6ckXgZuTmfg5cI68X0WnG7KJvk0DLioz/Wr9dkamcFJZg8xGzbI8/BVp/
-2Yn4t3bH4SaSX0WC1t0mbp2mdoPxPNT/MiNE74rKzPdd5y6EnH4vy6wZa6TAlQrN
-eFs8YLQ5Y5pcdWUfZWrGaj0uHAaSLH4KEOuy9/+jYddZkbvDKHa1+Ua6sAUnAq5h
-nIXfuM5GWsUqjZkov+eWHLufRUcEzsKIB8U7h1xOXN+WMXamvWY=
-=2PDh
+iQIzBAABCAAdFiEEIiRcgeO660E4s2BhMQ9WEgD0rXcFAl9X0SgACgkQMQ9WEgD0
+rXdSpg/+NNwDLsww1jVZku2sGyYbeWVJ3gt1Kes+tTNx0iCWSPG/h9sibcCumMyq
+XRvE63x0X4Y8uy5BuuTAMnMB52uxLeajPfA4OswsNgOiINEjbu41uIwwVdaSZl4R
+dcHD1yJhcp7fKRRSsPS/NGjl7U0Uq5ze33Jbv/TqY9nhd1OoZdAVnUu1VXg7yq9k
+v1sU+12InkrbXfAgv/NKfMf6ksEJuinJB+doW3MwOTSXesDW6reIYvABKxdgLSt+
+POcUJLncf6kNp9VTkS+cm2ewmkZ20HiWArXy7V2TzgS0ndNmv/0vq4C9TfP+aFuk
+jBB+I8G+A+IF9LZzIp2kLRlLd7Cn0mWR+Z1uGL9QCc0SPoBGjgBvXBSlKHYqFj2j
+0/LctrqmGQTipniheCnWCgfAZw3Z9Qk2zleq4UO3o9Ysnk9oanNRvmJ5Y2UaXolD
+2jgUVbqlB5AQvGqvhjwhiRAmW1mxB4iSbSz9FPrYnRf/nbkqXWJKxc8zdIOMqG6e
+9AvEQ1FkoGSDko4h50tKGA3E+0bMJE3cWiUgFeDOO+26Kk7Spotk/AfJH5DT8Psj
+PQ7Q3FUl9JpsMQXKqkLbpvSUX20f9Nso2v66AQZHZ0rJQK7FqrPgqpZQRlPmuqFp
+snN4Yo/Hw2BYeHVC9BH3VZeUQIpmOlPLtPNAhORSV/FobqHM4GM=
+=8oAx
 -----END PGP SIGNATURE-----
diff --git a/simple/securedrop-sdk/index.html b/simple/securedrop-sdk/index.html
index 864f21bf..62f64ed3 100644
--- a/simple/securedrop-sdk/index.html
+++ b/simple/securedrop-sdk/index.html
@@ -13,5 +13,7 @@ <h1>Links for securdrop-sdk</h1>
     <a href="/localwheels/securedrop_sdk-0.0.13-py3-none-any.whl">securedrop_sdk-0.0.13-py3-none-any.whl</a><br/>
     <a href="/localwheels/securedrop-sdk-0.1.0.tar.gz">securedrop-sdk-0.1.0.tar.gz</a><br/>
     <a href="/localwheels/securedrop_sdk-0.1.0-py3-none-any.whl">securedrop_sdk-0.1.0-py3-none-any.whl</a><br/>
+    <a href="/localwheels/securedrop-sdk-0.1.1.tar.gz">securedrop-sdk-0.1.1.tar.gz</a><br/>
+    <a href="/localwheels/securedrop_sdk-0.1.1-py3-none-any.whl">securedrop_sdk-0.1.1-py3-none-any.whl</a><br/>
   </body>
 </html>