From 0fdab9c70cf40d1f5fa0ec5a44a1aff0a084170b Mon Sep 17 00:00:00 2001 From: Kevin O Gorman Date: Wed, 13 May 2020 14:08:15 -0400 Subject: [PATCH] SecureDrop release 1.3.0 --- changelog.md | 17 +++-------------- docs/conf.py | 4 ++-- docs/set_up_admin_tails.rst | 4 ++-- .../ansible-base/group_vars/all/securedrop | 4 ++-- .../files/changelog-xenial | 10 ++-------- install_files/securedrop-config/DEBIAN/control | 2 +- install_files/securedrop-keyring/DEBIAN/control | 2 +- .../securedrop-ossec-agent/DEBIAN/control | 2 +- .../securedrop-ossec-server/DEBIAN/control | 2 +- molecule/builder-xenial/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 13 files changed, 19 insertions(+), 36 deletions(-) diff --git a/changelog.md b/changelog.md index 7dd02f6e5c..4d98f08dd5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,21 +1,10 @@ # Changelog -## 1.3.0~rc2 +## 1.3.0 ### Web Applications * Use WTForm for source interface submission form (#5226) - -### Developer Workflow - -* Dependency updates: - * pylint from 2.4.4 to 2.5.0 (#5219) - * astroid from 2.3.3 to 2.4.0 (#5219) - -## 1.3.0~rc1 - -### Web Applications - * Updated behavior of Logout button, adding a dedicated logout page with directions for sources on wiping Tor Browser session data (#5116) * Changed references to “journalists” in Source Interface text to “teams” (#5175) * Updated Source Interface to create a single source codename when multiple “/generate” tabs are opened in a single session (#5075) @@ -55,12 +44,12 @@ * urllib from 1.25.3 to 1.25.8; * safety from 1.8.4 to 1.8.7; * pillow from 6.2.1 to 7.0.0; - * astroid from 1.6.0 to 2.3.3; * mypy from 0.701 to 0.761; * pylint from 1.8.1 to 2.4.4; * markupsafe from 1.0 to 1.1.1; * setuptools from 41.6.0 to 46.0.0 - (#5182, #5151, #5133) + * astroid from 2.3.3 to 2.4.0 + (#5182, #5151, #5133, #5219) * Updated makefile lint target to ignore SC2230 shellcheck warnings (#5171) * CI: Updated translation tests to run in parallel across set of supported languages (#5062) * Added HTML markup to test submissions in dev environment (#5068) diff --git a/docs/conf.py b/docs/conf.py index b7be8f39a1..ecddb6da74 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '1.2.2' +version = '1.3.0' # The full version, including alpha/beta/rc tags. -release = '1.2.2' +release = '1.3.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/set_up_admin_tails.rst b/docs/set_up_admin_tails.rst index e653b65a08..d0474a0ea3 100644 --- a/docs/set_up_admin_tails.rst +++ b/docs/set_up_admin_tails.rst @@ -131,8 +131,8 @@ signed with the release signing key: .. code:: sh cd ~/Persistent/securedrop/ - git checkout 1.2.2 - git tag -v 1.2.2 + git checkout 1.3.0 + git tag -v 1.3.0 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the output of that last command along with the fingerprint above. diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index e3baa8f5e4..a0bf1c3e79 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,8 +2,8 @@ # Variables that apply to both the app and monitor server go in this file # If the monitor or app server need different values define the variable in # hosts_vars/app.yml or host_vars/mon.yml -securedrop_app_code_version: "1.3.0~rc2" -securedrop_app_code_sdist_version: "securedrop-app-code-1.3.0-rc2" +securedrop_app_code_version: "1.3.0" +securedrop_app_code_sdist_version: "securedrop-app-code-1.3.0" securedrop_app_code_sdist_name: "{{ securedrop_app_code_sdist_version }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial index ac35be7d69..18be7781bf 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial @@ -1,14 +1,8 @@ -securedrop-app-code (1.3.0~rc2+xenial) xenial; urgency=medium +securedrop-app-code (1.3.0+xenial) xenial; urgency=medium * See changelog.md - -- SecureDrop Team Tue, 05 May 2020 12:51:01 +0000 - -securedrop-app-code (1.3.0~rc1+xenial) xenial; urgency=medium - - * See changelog.md - - -- SecureDrop Team Fri, 24 Apr 2020 15:17:17 +0000 + -- SecureDrop Team Tue, 12 May 2020 18:37:42 +0000 securedrop-app-code (1.2.2+xenial) xenial; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 501e37e01e..8b629d05b0 100644 --- a/install_files/securedrop-config/DEBIAN/control +++ b/install_files/securedrop-config/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-config -Version: 0.1.3+1.3.0~rc2 +Version: 0.1.3+1.3.0 Architecture: all Description: Establishes baseline system state for running SecureDrop. Configures apt repositories. diff --git a/install_files/securedrop-keyring/DEBIAN/control b/install_files/securedrop-keyring/DEBIAN/control index 9802fb0f52..d641d92ef7 100644 --- a/install_files/securedrop-keyring/DEBIAN/control +++ b/install_files/securedrop-keyring/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-keyring -Version: 0.1.3+1.3.0~rc2 +Version: 0.1.3+1.3.0 Architecture: amd64 Depends: gnupg Description: Provides an apt keyring for SecureDrop-related packages, so the master signing key used for SecureDrop packages can be updated via apt. diff --git a/install_files/securedrop-ossec-agent/DEBIAN/control b/install_files/securedrop-ossec-agent/DEBIAN/control index 42c10bdafe..020d8c5063 100644 --- a/install_files/securedrop-ossec-agent/DEBIAN/control +++ b/install_files/securedrop-ossec-agent/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-agent -Version: 3.6.0+1.3.0~rc2 +Version: 3.6.0+1.3.0 Architecture: amd64 Depends: libevent-1.4-2,libpcre2-8-0,ossec-agent,securedrop-keyring,securedrop-config Replaces: ossec-agent diff --git a/install_files/securedrop-ossec-server/DEBIAN/control b/install_files/securedrop-ossec-server/DEBIAN/control index 1c3ff4ff3f..80175d6e79 100644 --- a/install_files/securedrop-ossec-server/DEBIAN/control +++ b/install_files/securedrop-ossec-server/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-server -Version: 3.6.0+1.3.0~rc2 +Version: 3.6.0+1.3.0 Architecture: amd64 Depends: libevent-1.4-2,libpcre2-8-0,ossec-server,securedrop-keyring,securedrop-config Replaces: ossec-server diff --git a/molecule/builder-xenial/tests/vars.yml b/molecule/builder-xenial/tests/vars.yml index d9fdffa654..24aefe228c 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.3.0~rc2" +securedrop_version: "1.3.0" ossec_version: "3.6.0" keyring_version: "0.1.3" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 23aa839063..f0bb29e763 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -1.2.2 +1.3.0 diff --git a/securedrop/version.py b/securedrop/version.py index 5d3dcc3506..19b4f1d605 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.3.0~rc2' +__version__ = '1.3.0' diff --git a/setup.py b/setup.py index 852db0c956..28a510dc95 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.3.0~rc2", + version="1.3.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",