Update staging by syncing with upstream #5
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.
Description
This PR updates our version of the Wazimap-ng backend with the latest changes from the upstream repo. It also maintains the addition of the
display_format
field in theProfileKeyMetrics
model that is used internally and resolves all conflicts arising from that change.Other changes are in regards to migrations, the PR merges some diverging leaves of root migrations following the addition of our custom field as explained above.
Some tests are failing and this is because they are failing even on the upstream branch, I've fixed some of them that were failing due to the addition of the
display_format
field and other easy to catch errors. Considering opening a PR to push the changes upstream??View commits for full changes after conflict resolution, including the fixing of some of the failing test files.
Related Issue
#4
How to test it locally
Run the docker compose command as shown in the
README.md
and verify it's working as expected.Changelog
Added
AWS_QUERYSTRING_AUTH
to readme and updated it's location to the main settings file. Changed read mode fromos.environ.get
toenv.str
to align with upstream.Updated
DISPLAY_FORMAT_CHOICES
constant to align with upstream changes of moving it toconstants.py
file.display_format
field.Removed
Checklist
Pull Request
Commits
Code Quality
Testing