Merge pull request #6040 from freedomofpress/post-2.0.1-cleanup

Backport 2.0.1 changelog to develop, un-xfail admin test.
freedomofpress · Jul 12, 2021 · 1a2494d · 1a2494d
2 parents b10ad8b + 3723761
commit 1a2494d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/admin/tests/test_integration.py b/admin/tests/test_integration.py
@@ -586,8 +586,6 @@ def test_check_for_update_when_updates_not_needed(securedrop_git_repo):
     assert child.signalstatus is None
 
 
-# This test will fail until a tag with the 2021 signing key is pushed
-@pytest.mark.xfail
 @flaky(max_runs=3)
 def test_update(securedrop_git_repo):
     gpgdir = os.path.join(os.path.expanduser('~'), '.gnupg')

diff --git a/changelog.md b/changelog.md
@@ -2,7 +2,15 @@
 
 ## 2.1.0~rc1
 
+## 2.0.1
 
+### Operations
+
+* Updated admin dependencies: cryptography from 3.2.1 to 3.4.7, cffi from 1.14.2 to 1.14.5 (#6030)
+
+### Development
+
+* Updated testinfra tests to use site-specific configuration against production instances (#6032)
 
 ## 2.0.0
 

diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal
@@ -1,8 +1,14 @@
 securedrop-app-code (2.1.0~rc1+focal) focal; urgency=medium
 
-  * see changelog.md
+  * 
+
+ -- SecureDrop Team <[email protected]>  Fri, 09 Jul 2021 15:40:20 -0400
+
+securedrop-app-code (2.0.1+focal) focal; urgency=medium
+
+  * see changelog.md 
 
- -- SecureDrop Team <[email protected]>  Thu, 24 Jun 2021 12:17:15 -0400
+ -- SecureDrop Team <[email protected]>  Thu, 08 Jul 2021 13:32:06 -0400
 
 securedrop-app-code (2.0.0+focal) focal; urgency=medium
 

diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver
@@ -1 +1 @@
-2.0.0
+2.0.1