Activity 1.0 release: update main #787
Merged
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
Bumps [django](https://github.com/django/django) from 2.2.10 to 2.2.13. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@2.2.10...2.2.13) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* refactor(workflow): remove unused computed attribute of ActivityUser * refactor(workflow): disable unused logged users feature * docs(workflow): remove the wrong proposed reimplementation of LoggedUser * fix(workflow): resolve flake8 issues in models.py Co-authored-by: Andrew <andrew.tc.pham@gmail.com> Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com>
* refactor(formlibrary): clean up the TrainingAttendance model and views.py * chore(formlibrary): migration for deleting TrainingAttendance * test(formlibrary): remove TrainingAttendance tests * fix: import statements related to formlibrary
- fixes issue where target column in indicator list is not updating until refresh [fixes #638] Co-authored-by: Allan Mogusu <allanmogusu@Appless-MacBook-Pro.local>
#492 Issue fix
- fixes #645 Co-authored-by: Allan Mogusu <allanmogusu@Appless-MacBook-Pro.local>
* build image without secrets * No source path * I have to source * Add vault configs to dev env Fix branch issues on GA
Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* ACT-725 When Editing a project other organizations' programs are available Current Behavior: All the programs in the system are available when editing a project Expected Behavior: Only programs belonging to an organization should be available when editing a projects * formlibrary: define new models and refactor into a package * formlibrary: migrations for model changes * formlibrary: nested README (WIP) * formlibrary: refactor services common fields * formlibrary: Readme update * formlibrary: README update * ACT-727 Change Django views to DRF views: Individual model Left the previous views for now. If this is ok, I can proceed to integrate with the front-end. Also, having one view for both List+CRUD is no good practice. so, my changes can be tested at /formlibrary/individual for List and formlibrary/individual/PK for single items * formlibrary: update README on tests * formlibrary: refactor and code style of the models * [refactor]: Refactor and update formlibrary models. Make more use of Abstract models, remove unecessary fields, re-make migrations, update the Admin interface for the Formlibrary app. * formlibrary: resolve migrations conflict * formlibrary: move the Case model to case.py * docs(formlibrary): docstrings and comments * refactor(formlibrary): use absolute imports for models * docs(formlibrary): On slug fields and fixtures * formlibrary(fix): resolve circular dependcy error * tests(forlibrary): first draft of training and distribution tests * WIP(formlibrary): add calculated fields to service for total supported cases * WIP(formlibrary): mixin for created/modified dates * WIP(formlibrary): adjust relationships of Service model * chore(fixtures): format JSON fixtures * feat(fixtures): offices, programs and trainings * refactor(fixtures): move test fixtures into their own folder * test(formlibrary): creation and edit of training * test(formlibrary): placeholder for relationship testing of Training * Correct formlibrary test errors and failures. With the models update, some tests needed to be updated. * test(formlibrary): define fixtures for Users and ActivityUsers * WIP(formlibrary): add created/modified by fields to service models * test(formlibrary): adapt training fixture to recent changes * test(formlibrary): created/modified by fields of training and distribution * test(formlibrary): modified_by field for training fixtures * fix(formlibrary): flake8 issues * chore(formlibrary): remove unused fixtures (FormGuidance, IndicatorType and Levels) * refactor(formlibrary): inherit common service fields directly in Service model * chore(formlibrary): reconciliate and merge migrations * chore(formlibrary): resolve flake8 warnings * feat(forlibrary): tweak validation of start/end dates * test(formlibrary): fix Distribution tests * feat(formlibrary): update the Distribution model * test(formlibrary): update Distriution tests and refactor Training tests * test(formlibrary): refactor legacy tests * refactor(formlibrary): regenerate migrations * fix(formlibrary): squash migrations into a single one * Revert "fix(formlibrary): squash migrations into a single one" This reverts commit dc98fbe. * Revert "feat(formlibrary): update the Distribution model" This reverts commit 07800ab. * fix(formlibrary): regenerate migrations starting from current state in dev branch - Copied formlibrary migrations from dev branch into this branch - Regenerated migrations to translate new changes, on top of old state * fix(formlibrary): manual reconciliation in migrations for altering the ID fields to UUID type * fix(formlibrary): remove AlterField in migration of distribution * Refactor abstract models Update tests to reflect the updates made. Move the abstract classes to the utils app. Update forms to allow the creation of distributions and trainings from the app ui. * revert(formlibrary): set the formlibrary migrations to current state in branch formlibrary-app-update This is done in order to generate migrations reflecting the new models changes on top of the old ones. * chore(formlibrary): generate migrations for the latest changes * fix(formlibrary): resolve migration conflict on training.id * chore(formlibrary): linting tweaks * feat(formlibrary): display WIP page on form library Create a /comingsoon URL under formlibrary Create a Coming Soon template for formlibrary to wrap into base.html Refactor Coming Soon template to use * fix(formlibrary): unset primary_key on UUIDs and properly name their attributes * fix(formlibrary): alter field site of Service to SiteProfile * fix(formlibrary): correct Distribution model to pass the tests * refactor(formlibrary): improve pylint score of formlibrary * add temporary fix for linting issues * fix(formlibrary): regenerate migrations for previously merged PR * fix(formlibrary): reconciliate migrations * chore(git): add assets directory to .gitignore * fix(formlibrary): reconciliate migrations changes after dev merge * refactor: resolve Flake8 issues * fix(formlibrary): Flake8 issues * refactor(utils): set the create_date using a default value Co-authored-by: mikael19 <mikaelsondi@gmail.com> Co-authored-by: Andrew <andrew.tc.pham@gmail.com> Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com> Co-authored-by: Isaac Kimaiyo <biwot777@gmail.com>
- fixes issue #626 where clearing a target field lists multiple errors Co-authored-by: Allan Mogusu <allanmogusu@Appless-MacBook-Pro.local> Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com> Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* Optimize dev and staging resources * Test deployment with vault secrets
Update documentation
…a-io/activity into 767-pip-tools-dependencies
Remove unused Terraform files and empty test files
PIP dependencies refactor
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](python-pillow/Pillow@8.2.0...8.3.2) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
fix(email): correct link in confirmation email
Build(deps): Bump pillow from 8.2.0 to 8.3.2
* docs: add command to copy settings file * included a step to copy setting file during docker build Co-authored-by: Amos Njoroge <sannleen@gmail.com>
* upgrade dependencies * update requirements.in
* Build(deps): Bump oauthlib from 3.1.1 to 3.2.1 Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.1.1 to 3.2.1. - [Release notes](https://github.com/oauthlib/oauthlib/releases) - [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst) - [Commits](oauthlib/oauthlib@v3.1.1...v3.2.1) --- updated-dependencies: - dependency-name: oauthlib dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * docs: add command to copy settings file (#780) * docs: add command to copy settings file * included a step to copy setting file during docker build Co-authored-by: Amos Njoroge <sannleen@gmail.com> * upgrade dependencies (#786) * upgrade dependencies * update requirements.in * remove google oauth Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anas TIOUR <anastiour@gmail.com> Co-authored-by: Amos Njoroge <sannleen@gmail.com> Co-authored-by: Andrew <4407063+andrewtpham@users.noreply.github.com> Co-authored-by: andrewtpham <andrew.tc.pham@gmail.com>
Co-authored-by: Andrew <4407063+andrewtpham@users.noreply.github.com>
Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.1.0 to 2.4.0. - [Release notes](https://github.com/jpadilla/pyjwt/releases) - [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst) - [Commits](jpadilla/pyjwt@2.1.0...2.4.0) --- updated-dependencies: - dependency-name: pyjwt dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew <4407063+andrewtpham@users.noreply.github.com>
Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.4.1 to 0.4.2. - [Release notes](https://github.com/andialbrecht/sqlparse/releases) - [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG) - [Commits](andialbrecht/sqlparse@0.4.1...0.4.2) --- updated-dependencies: - dependency-name: sqlparse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew <4407063+andrewtpham@users.noreply.github.com>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #787 +/- ##
=======================================
Coverage ? 57.55%
=======================================
Files ? 140
Lines ? 9210
Branches ? 0
=======================================
Hits ? 5301
Misses ? 3909
Partials ? 0
|
amosnjoroge
approved these changes
Sep 22, 2022
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.
What is the Purpose?
Update
mainwith latest indevelopMentions?
@amosnjoroge
Issue(s) affected?
List of issues addressed by this PR.