Reset master to release #5203
Merged
Reset master to release #5203
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
During review of #4865, I misinterpreted the new checkboxes as a sequential list, rather than an either/or choice. Adding a small clarification to prevent future misunderstandings. =)
Updates pip dependencies: Ansible, Pyyaml, Jinja2, Molecule, Werkzeug
This will inform the admins to rerun ./securedrop-admin setup as this will create .venv3 dirctory for Python3 dependencies.
As Tor4 has Python 3.7.3, we should just mention without any particular version.
A smattering of the familiar Python 2 -> 3 changes, mostly around string handling, filepaths to interpreters and virtualenvs, and syntax updates. Specifically: * coerces major release number to int * converts iteritems() -> items() in dynamic inventory * updates string handling in dynamic inventory * ensures securedrop_init runs under python3 Tested under Tails 3.16 (based on Stretch), running Python 3.5. Worked well, after these fixes landed, although I've observed a handful of the "weakref" stderr output. The weakref output doesn't break anything, but it may be alarming to Admins who haven't updated to Tails 4 & Python 3.7 yet.
Moves securedrop-admin into Python 3
Enables Source and Journalist desktop icons in Tails 4
Improve specification of securedrop-app-code dependencies
- The "Get Tor" instructions as written didn't work; the email autoresponder requires the OS to be specified, and the GitHub downloads are currently not available. - The instructions suggested visiting the .onion address _before_ "choosing who to submit to". - Added a recommendation to verify the .onion address against the SecureDrop Directory - Used more common terms in a couple of places (e.g., "USB Flash Drive" instead of "USB Key"), simplified Flag for Reply language - Wrap to 80 characters
Fix scaling of diagrams in docs
Several instances of the warning below:
[DEPRECATION WARNING]: Invoking "apt" only once while using a loop via
squash_actions is deprecated. Instead of using a loop to supply multiple items
and specifying `name: "{{ item }}"`, please use `name: '{{ unused_packages }}'`
and remove the loop. This feature will be removed in version 2.11. Deprecation
warnings can be disabled by setting deprecation_warnings=False in ansible.cfg.
…assword Added check for admin password in GUI updater
contributors: 1000101 Michal Stanke darmozrac michaela-bot updated from: repo: https://github.com/freedomofpress/securedrop-i18n revision: 570f297
Update Ansible to 2.7.13
Also update the translation-test script so it gets the list of supported locales from i18n_tool.py and will no longer have to be updated when we change that list.
Edits for readability and concision. Also remove last of language related to RTD migration.
Edit README section about documentation
These requirements were installed via pip in the Dev/Admin Docker containers. We should instead add them to the develop-requirements file and pin hashes. The `--allow-unsafe` flags should not impact security: it is to allow pip to pin setuptools and pip-tools (see issue #4686).
Also adds --allow-unsafe to allow pinning hashes of setuptools in test-requirements.txt The `--allow-unsafe` flags should not impact security: it is to allow pip to pin setuptools and pip-tools (see issue #4686).
Update Tor to 0.4.1.6
Certain combinations of language and viewport size could result in the two columns on the source start page not lining up with each other. This changes the columns' justify-content property to push the top and bottom containers apart, and controls the borders and content of the buttons to align them better.
…n-requirements Pin all dev and testing dependencies
Add Czech to list of supported languages
The page moved to a new URL without a redirect
Bump app tests timeout to 15 minutes
Update version to 1.2.1~rc1
(cherry picked from commit 63f88f7)
Update version to 1.2.1 final
(cherry picked from commit 71924ca)
(Rounded corners edited out as they have a glitchy looking fringe outside the context in which the screenshot was taken) (cherry picked from commit a128e49)
[1.2.1] Add 1.2.0 to 1.2.1 update guide for workstations
Add 1.2.1 upgrade testing boxes
(cherry picked from commit cad15e9)
(cherry picked from commit 3b688d4)
(cherry picked from commit 1f20b71)
(cherry picked from commit 5dad266)
Build image needed updates (cherry picked from commit 33b252c)
(cherry picked from commit 5b19b19)
[1.2.2] Backport 5157, 5158 and 5159 (and 5151, 5154 for CI to pass)
1.2.2 version update
(cherry picked from commit 5fa2b49)
[1.2.2] Add 1.2.1->1.2.2 upgrade guide
|
This pull request introduces 14 alerts and fixes 9 when merging 93f5212 into 2350afb - view on LGTM.com new alerts:
fixed alerts:
|
redshiftzero
approved these changes
Apr 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Addresses #5081.
Updates master to reflect the latest release branch, to allow it to be used as a stable point for ReadTheDocs-hosted documentation.
Testing
masterbranch is identical torelease/1.2.2?